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.514 by root, Mon Apr 12 17:13:36 2010 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 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 112
113our $OUTPUT_RATE_MIN = 4000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
115 118
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 121our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 127our $DB_ENV;
125 128
126our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 130
128our %CFG; 131our %CFG;
129 132
130our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 134our $RUNTIME;
… …
165 168
166our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
167 170
168sub cf::map::normalise; 171sub cf::map::normalise;
169 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
170############################################################################# 177#############################################################################
171 178
172%REFLECT = (); 179%REFLECT = ();
173for (@REFLECT) { 180for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
226from wherever your confdir points to. 233from wherever your confdir points to.
227 234
228=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
229 236
230These 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
231returns 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
232per 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();
233 245
234=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
235 247
236This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
237C<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
… …
245 257
246=back 258=back
247 259
248=cut 260=cut
249 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
250$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 269 my $msg = join "", @_;
252 270
253 $msg .= "\n" 271 $msg .= "\n"
254 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
255 273
256 $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;
257 275
258 LOG llevError, $msg; 276 LOG llevWarn, $msg;
259}; 277};
260 278
261$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
263 281
264 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
265 283
266 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 286 return;#d#
269 }#d# 287 }#d#
270 288
271 # kill coroutine otherwise 289 # kill coroutine otherwise
272 Coro::terminate 290 Coro::terminate
… …
339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340 358
341sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
343 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
344=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
345 375
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
348 378
349The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 380is a reload or not.
351 381
352=cut 382=cut
353 383
354sub post_init(&) { 384sub post_init(&) {
… …
505=cut 535=cut
506 536
507sub sync_job(&) { 537sub sync_job(&) {
508 my ($job) = @_; 538 my ($job) = @_;
509 539
510 if ($Coro::current == $Coro::main) { 540 if (in_main) {
511 my $time = AE::time; 541 my $time = AE::time;
512 542
513 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
515 545
516 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
517 547
518 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
519 549
520 my $busy = 1; 550 my $busy = 1;
521 my @res; 551 my @res;
522 552
523 (async { 553 (async {
524 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 555 @res = eval { $job->() };
526 warn $@ if $@; 556 error $@ if $@;
527 undef $busy; 557 undef $busy;
528 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
529 559
530 while ($busy) { 560 while ($busy) {
531 if (Coro::nready) { 561 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
566 596
567 $coro 597 $coro
568} 598}
569 599
570=item fork_call { }, $args 600=item fork_call { }, @args
571 601
572Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 605never block itself or use any form of event handling.
576 606
577=cut 607=cut
578 608
609sub post_fork {
610 reset_signals;
611}
612
579sub fork_call(&@) { 613sub fork_call(&@) {
580 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
581 615
582 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
583 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
585 619
586 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
587 reset_signals; 621 cf::post_fork;
588 &$cb 622 &$cb
589 }, @args; 623 } @args;
590 624
591 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
592} 626}
593 627
594sub objinfo { 628sub objinfo {
… …
644within each server. 678within each server.
645 679
646=cut 680=cut
647 681
648sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
649 my ($name) = @_; 686 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
651 688
652 eval { 689 eval {
653 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
… …
663} 700}
664 701
665our $DB; 702our $DB;
666 703
667sub db_init { 704sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
670 };
671} 706}
672 707
673sub db_get($$) { 708sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
675 710
676 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
677 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
678 715
679 $! ? () 716 $! ? ()
680 : $data 717 : $data
681 }
682} 718}
683 719
684sub db_put($$$) { 720sub db_put($$$) {
685 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
742 778
743 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 780 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
746 782
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 784
749 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
752 788
… …
762 798
763=cut 799=cut
764 800
765sub datalog($@) { 801sub datalog($@) {
766 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 804}
769 805
770=back 806=back
771 807
772=cut 808=cut
… …
967 1003
968 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1006
971 } elsif (ref $type) { 1007 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
973 1009
974 } else { 1010 } else {
975 shift @arg; 1011 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
977 } 1013 }
978 } 1014 }
979} 1015}
980 1016
981sub _object_attach { 1017sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
992 } 1028 }
993 1029
994 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
995 } else { 1031 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1033 }
998 1034
999 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
1000} 1036}
1001 1037
… …
1060 1096
1061 for (@$callbacks) { 1097 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1063 1099
1064 if ($@) { 1100 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1102 override;
1068 } 1103 }
1069 1104
1070 return 1 if $override; 1105 return 1 if $override;
1071 } 1106 }
… …
1150 for (@$attach) { 1185 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1153 } 1188 }
1154 } else { 1189 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1191 }
1157 } 1192 }
1158} 1193}
1159 1194
1160cf::attachable->attach ( 1195cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1188 1223
1189 sync_job { 1224 sync_job {
1190 if (length $$rdata) { 1225 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1194 1230
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1234 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1221 1257
1222 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1260 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1226 } 1262 }
1227 } else { 1263 } else {
1228 aio_unlink $filename; 1264 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1230 } 1266 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1291 $av = $st->{objs};
1256 } 1292 }
1257 1293
1258 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1261 1298
1262 ($data, $av) 1299 ($data, $av)
1263} 1300}
1264 1301
1265=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
… …
1357 1394
1358 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1396 if $reply;
1360 1397
1361 } else { 1398 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1400 }
1364 1401
1365 cf::override; 1402 cf::override;
1366 }, 1403 },
1367); 1404);
… …
1378 1415
1379 $grp 1416 $grp
1380} 1417}
1381 1418
1382sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1383 cf::sync_job { 1422 cf::sync_job {
1384 my %todo; 1423 my %todo;
1385 1424
1386 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1426 next unless -r $path;
… …
1405 1444
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1447
1409 $ext{source} = 1448 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1412 . $source 1451 . $source
1413 . "\n};\n1"; 1452 . "\n};\n1";
1414 1453
1415 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1467 next ext
1429 unless exists $done{$_}; 1468 unless exists $done{$_};
1430 } 1469 }
1431 1470
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1472
1434 my $active = eval $v->{source}; 1473 my $active = eval $v->{source};
1435 1474
1436 if (length $@) { 1475 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1476 error "$v->{path}: $@\n";
1438 1477
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1479 if exists $v->{meta}{mandatory};
1480
1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1482 delete $todo{$k};
1441 } else { 1483 } else {
1442 $done{$k} = delete $todo{$k}; 1484 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1485 push @EXTS, $v->{pkg};
1444 $progress = 1; 1486 $progress = 1;
1445 1487
1446 warn "$v->{base}: extension inactive.\n" 1488 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1489 unless $active;
1448 } 1490 }
1449 } 1491 }
1450 1492
1451 unless ($progress) { 1493 unless ($progress) {
… …
1620 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1621 1663
1622 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1624 1666
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626 $pl->deactivate; 1668 $pl->deactivate;
1669
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1630 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1631 1675
1632 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1634 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
… …
1688 \@logins 1732 \@logins
1689} 1733}
1690 1734
1691=item $player->maps 1735=item $player->maps
1692 1736
1737=item cf::player::maps $login
1738
1693Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1694player. May block. 1740player. May block.
1695 1741
1696=cut 1742=cut
1697 1743
… …
1758 1804
1759=cut 1805=cut
1760 1806
1761sub find_by_path($) { 1807sub find_by_path($) {
1762 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1763 1811
1764 my ($match, $specificity); 1812 my ($match, $specificity);
1765 1813
1766 for my $region (list) { 1814 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
… …
1824 1872
1825sub register { 1873sub register {
1826 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 1875 my $pkg = caller;
1828 1876
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 1878
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1880}
1834 1881
1835# also paths starting with '/' 1882# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1884
1838sub thawer_merge { 1885sub thawer_merge {
1839 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1840 1887
1841 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
… …
1846} 1893}
1847 1894
1848sub normalise { 1895sub normalise {
1849 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1850 1897
1851 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1852 1899
1853 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1854 1901
1855 # map plan: 1902 # map plan:
1856 # 1903 #
… …
1895 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1896 return $self; 1943 return $self;
1897 } 1944 }
1898 } 1945 }
1899 1946
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 1948 ()
1902} 1949}
1903 1950
1904sub init { 1951sub init {
1905 my ($self) = @_; 1952 my ($self) = @_;
… …
2027} 2074}
2028 2075
2029sub find; 2076sub find;
2030sub find { 2077sub find {
2031 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2079
2080 cf::cede_to_tick;
2032 2081
2033 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
2034 2083
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2151 or next; 2200 or next;
2152 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2153 or next; 2202 or next;
2154 $neigh->load; 2203 $neigh->load;
2155 2204
2205 # now find the diagonal neighbours
2156 push @neigh, 2206 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 } 2209 }
2160 2210
… …
2167} 2217}
2168 2218
2169sub find_sync { 2219sub find_sync {
2170 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2171 2221
2172 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2173} 2226}
2174 2227
2175sub do_load_sync { 2228sub do_load_sync {
2176 my ($map) = @_; 2229 my ($map) = @_;
2177 2230
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2180 2233
2181 cf::sync_job { $map->load }; 2234 $map->load;
2182} 2235}
2183 2236
2184our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2186 2239
… …
2212 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2213 2266
2214 () 2267 ()
2215} 2268}
2216 2269
2270# common code, used by both ->save and ->swapout
2217sub save { 2271sub _save {
2218 my ($self) = @_; 2272 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2273
2222 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2223 2275
2224 return unless $self->dirty; 2276 return unless $self->dirty;
2225 2277
… …
2245 } else { 2297 } else {
2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247 } 2299 }
2248} 2300}
2249 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2250sub swap_out { 2310sub swap_out {
2251 my ($self) = @_; 2311 my ($self) = @_;
2252 2312
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2314
2258 return if $self->players;
2259 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2260 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2261 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2263 2369
2264 $self->deactivate; 2370 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2372 $self->clear;
2267}
2268
2269sub reset_at {
2270 my ($self) = @_;
2271
2272 # TODO: safety, remove and allow resettable per-player maps
2273 return 1e99 if $self->{deny_reset};
2274
2275 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278 $time + $to
2279}
2280
2281sub should_reset {
2282 my ($self) = @_;
2283
2284 $self->reset_at <= $cf::RUNTIME
2285}
2286
2287sub reset {
2288 my ($self) = @_;
2289
2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292 return if $self->players;
2293
2294 warn "resetting map ", $self->path, "\n";
2295
2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # need to save uniques path
2299 unless ($self->{deny_save}) {
2300 my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2303 if $uniq;
2304 }
2305
2306 delete $cf::MAP{$self->path};
2307
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->clear;
2311 2373
2312 $self->unlink_save; 2374 $self->unlink_save;
2313 $self->destroy; 2375 $self->destroy;
2314} 2376}
2315 2377
… …
2323 2385
2324 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2325 2387
2326 $self->unlink_save; 2388 $self->unlink_save;
2327 2389
2328 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2395
… …
2563 2625
2564Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2565 2627
2566The player should be reasonably safe there for short amounts of time (e.g. 2628The player should be reasonably safe there for short amounts of time (e.g.
2567for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link 2630though, as the player cannot control the character while it is on the link
2569map. 2631map.
2570 2632
2571Will never block. 2633Will never block.
2572 2634
2573=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
… …
2594sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2595 my ($self) = @_; 2657 my ($self) = @_;
2596 2658
2597 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2598 2660
2661 ++$self->{_link_recursion};
2662
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2664
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2603 2667
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2669}
2606 2670
2607sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2609 2673
… …
2634 $map->load_neighbours; 2698 $map->load_neighbours;
2635 2699
2636 return unless $self->contr->active; 2700 return unless $self->contr->active;
2637 2701
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2640 2704 # entering was successful
2705 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2706 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2707 $self->activate_recursive;
2643} 2708 }
2644 2709
2710}
2711
2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2646 2713
2647Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2648her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2649that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2650the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
… …
2657 2724
2658our $GOTOGEN; 2725our $GOTOGEN;
2659 2726
2660sub cf::object::player::goto { 2727sub cf::object::player::goto {
2661 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2662 2735
2663 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2738
2666 $self->enter_link; 2739 $self->enter_link;
… …
2690 my $map = eval { 2763 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2692 2765
2693 if ($map) { 2766 if ($map) {
2694 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2769 } else {
2697 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2698 } 2771 }
2699 2772
2700 $map 2773 $map
… …
2708 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2711 } 2784 }
2712 2785
2713 $done->() if $done; 2786 $done->($self) if $done;
2714 })->prio (1); 2787 })->prio (1);
2715} 2788}
2716 2789
2717=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2718 2791
… …
2811 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2813 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2815 2888
2816 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 2890 $self->leave_link;
2818 } 2891 }
2819 })->prio (1); 2892 })->prio (1);
2820} 2893}
2821 2894
… …
3134 3207
3135 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3136 if $reply; 3209 if $reply;
3137 3210
3138 } else { 3211 } else {
3139 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3140 } 3213 }
3141 3214
3142 cf::override; 3215 cf::override;
3143 }, 3216 },
3144); 3217);
… …
3225 decrease split destroy change_exp value msg lore send_msg)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3226 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3227 ["cf::player" => qw(peaceful send_msg)], 3300 ["cf::player" => qw(peaceful send_msg)],
3228 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3229) { 3302) {
3230 no strict 'refs';
3231 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233 for @funs; 3305 for @funs;
3234} 3306}
3235 3307
… …
3274 local @cf::_safe_eval_args = values %vars; 3346 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3347 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3348 }
3277 3349
3278 if ($@) { 3350 if ($@) {
3279 warn "$@"; 3351 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3282 } 3354 }
3283 3355
3284 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3285} 3357}
3286 3358
… …
3320 # for this (global event?) 3392 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3322 3394
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3396
3325 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3326 3398
3327 my $facedata;
3328 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3329 or die "$path: $!"; 3400 or die "$path: $!";
3330 3401
3331 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3332 3403
3333 $facedata->{version} == 2 3404 $facedata->{version} == 2
… …
3364 3435
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3439 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3441 }
3371 3442
3372 cf::cede_to_tick; 3443 cf::cede_to_tick;
3373 } 3444 }
3374 } 3445 }
… …
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3464
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3396 } else { 3467 } else {
3397 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3398 } 3469 }
3399 3470
3400 cf::cede_to_tick; 3471 cf::cede_to_tick;
3401 } 3472 }
3402 } 3473 }
3403 3474
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3476
3406 1 3477 1
3407} 3478}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3428 3479
3429register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3431 3482
3432 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
… …
3471sub reload_treasures { 3522sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3474} 3525}
3475 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3476sub reload_resources { 3550sub reload_resources {
3477 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3478 3552
3553 reload_exp_table;
3554 reload_materials;
3479 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3480 reload_archetypes; 3557 reload_archetypes;
3481 reload_regions; 3558 reload_regions;
3482 reload_treasures; 3559 reload_treasures;
3483 3560
3484 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3485} 3562}
3486 3563
3487sub reload_config { 3564sub reload_config {
3488 warn "reloading config file...\n"; 3565 trace "reloading config file...\n";
3489 3566
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3567 0 < aio_load "$CONFDIR/config", my $config
3491 or return; 3568 or die "$CONFDIR/config: $!";
3492 3569
3493 local $/; 3570 utf8::decode $config;
3494 *CFG = YAML::XS::Load scalar <$fh>; 3571 *CFG = yaml_load $config;
3495 3572
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3574
3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3500 3577
3501 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
… …
3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3580 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3581 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3582 };
3506 warn $@ if $@; 3583 warn $@ if $@;
3507 } 3584 }
3508
3509 warn "finished reloading resource files\n";
3510} 3585}
3511 3586
3512sub pidfile() { 3587sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3589 or die "$PIDFILE: $!";
… …
3527 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3528 print $fh $$; 3603 print $fh $$;
3529} 3604}
3530 3605
3531sub main_loop { 3606sub main_loop {
3532 warn "EV::loop starting\n"; 3607 trace "EV::loop starting\n";
3533 if (1) { 3608 if (1) {
3534 EV::loop; 3609 EV::loop;
3535 } 3610 }
3536 warn "EV::loop returned\n"; 3611 trace "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3612 goto &main_loop unless $REALLY_UNLOOP;
3538} 3613}
3539 3614
3540sub main { 3615sub main {
3541 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3542 3617
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 cf::init_experience;
3549 cf::init_anim;
3550 cf::init_attackmess;
3551 cf::init_dynamic;
3552 3622
3553 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3554 3624
3555 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3556 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
… …
3562 }; 3632 };
3563 3633
3564 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3565 3635
3566 cf::sync_job { 3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3567 cf::load_settings; 3643 cf::load_settings;
3568 cf::load_materials;
3569 3644
3570 reload_resources; 3645 reload_resources;
3571 reload_config; 3646 reload_config;
3572 db_init; 3647 db_init;
3573 3648
… …
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589 3664
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3591 }; 3666 };
3592 3667
3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3593 main_loop; 3676 goto &main_loop;
3594} 3677}
3595 3678
3596############################################################################# 3679#############################################################################
3597# initialisation and cleanup 3680# initialisation and cleanup
3598 3681
… …
3637 or return; 3720 or return;
3638 3721
3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3640 and return; 3723 and return;
3641 3724
3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3643 3726
3644 1 3727 1
3645} 3728}
3646 3729
3647our $uuid_lock; 3730our $uuid_lock;
… …
3659 or return; 3742 or return;
3660 3743
3661 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3662 3745
3663 unless ($value) { 3746 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3665 return; 3748 return;
3666 } 3749 }
3667 3750
3668 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3669 $uuid_skip = 0; 3752 $uuid_skip = 0;
… …
3679 or return; 3762 or return;
3680 3763
3681 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3682 and return; 3765 and return;
3683 3766
3684 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3685 3768
3686 1 3769 1
3687 3770
3688} 3771}
3689 3772
… …
3695} 3778}
3696 3779
3697sub emergency_save() { 3780sub emergency_save() {
3698 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3699 3782
3700 warn "emergency_perl_save: enter\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3701 3789
3702 cf::sync_job { 3790 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so 3791 cf::write_runtime_sync; # external watchdog should not bark
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707 3792
3708 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3709 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3710 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3711 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3712 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3713 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3714 $pl->valid or next; 3799 $pl->valid or next;
3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3716 $pl->save; 3801 $pl->save;
3717 } 3802 }
3718 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3719 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3720 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3721 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3722 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3723 $map->valid or next; 3810 $map->valid or next;
3724 $map->save; 3811 $map->save;
3725 } 3812 }
3726 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3727 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3728 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3729 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3730 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3731 3820
3732 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3733 write_uuid_sync 1; 3822 write_uuid_sync 1;
3734 warn "emergency_perl_save: end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3735 }; 3843 };
3736 3844
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3742 warn "emergency_perl_save: leave\n"; 3845 info "emergency_perl_save: leave\n";
3743} 3846}
3744 3847
3745sub post_cleanup { 3848sub post_cleanup {
3746 my ($make_core) = @_; 3849 my ($make_core) = @_;
3747 3850
3851 IO::AIO::flush;
3852
3748 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3749 if $make_core; 3854 if $make_core;
3750 3855
3751 my $fh = pidfile; 3856 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3753} 3858}
… …
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 } 3882 }
3778 warn "cleared package $pkg\n";#d#
3779} 3883}
3780 3884
3781sub do_reload_perl() { 3885sub do_reload_perl() {
3782 # can/must only be called in main 3886 # can/must only be called in main
3783 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3784 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3785 return; 3889 return;
3786 } 3890 }
3787 3891
3788 return if $RELOAD++; 3892 return if $RELOAD++;
3789 3893
3790 my $t1 = AE::time; 3894 my $t1 = AE::time;
3791 3895
3792 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3793 warn "reloading..."; 3898 info "reloading...";
3794 3899
3795 warn "entering sync_job"; 3900 trace "entering sync_job";
3796 3901
3797 cf::sync_job { 3902 cf::sync_job {
3798 cf::write_runtime_sync; # external watchdog should not bark
3799 cf::emergency_save; 3903 #cf::emergency_save;
3800 cf::write_runtime_sync; # external watchdog should not bark
3801 3904
3802 warn "syncing database to disk";
3803 BDB::db_env_txn_checkpoint $DB_ENV;
3804
3805 # if anything goes wrong in here, we should simply crash as we already saved
3806
3807 warn "flushing outstanding aio requests";
3808 while (IO::AIO::nreqs || BDB::nreqs) {
3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3810 }
3811
3812 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3813 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3814 %EXT_CORO = (); 3907 %EXT_CORO = ();
3815 3908
3816 warn "removing commands"; 3909 trace "removing commands";
3817 %COMMAND = (); 3910 %COMMAND = ();
3818 3911
3819 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3820 %EXTCMD = (); 3913 %EXTCMD = ();
3821 %EXTICMD = (); 3914 %EXTICMD = ();
3822 3915
3823 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3824 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3825 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3826 3919
3827 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3828 eval { 3921 eval {
3829 $cb->($pkg); 3922 $cb->($pkg);
3830 1 3923 1
3831 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3832 } 3925 }
3833 3926
3834 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3835 clear_package $pkg; 3928 clear_package $pkg;
3836 } 3929 }
3837 3930
3838 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841 3934
3842 warn "... unloading $k"; 3935 trace "... unloading $k";
3843 delete $INC{$k}; 3936 delete $INC{$k};
3844 3937
3845 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3847 3940
… …
3850 } 3943 }
3851 3944
3852 clear_package $k; 3945 clear_package $k;
3853 } 3946 }
3854 3947
3855 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3856 clear_package "safe::$_" 3949 clear_package "safe::$_"
3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3858 3951
3859 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3860 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3862 3955
3863 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3864 # and global variables created in xs 3957 # and global variables created in xs
3865 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3866 3959
3867 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3868 3961
3869 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3870 require cf; 3963 require cf;
3871 cf::_connect_to_perl_1; 3964 cf::_connect_to_perl_1;
3872 3965
3873 warn "loading config and database again"; 3966 trace "loading config and database again";
3874 cf::reload_config; 3967 cf::reload_config;
3875 3968
3876 warn "loading extensions"; 3969 trace "loading extensions";
3877 cf::load_extensions; 3970 cf::load_extensions;
3878 3971
3879 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3880 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3881 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3882 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3883 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3884 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3885 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3886 } 3979 }
3887 3980
3888 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3889 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3890 3983
3891 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3892 3985
3893 1 3986 1
3894 } or do { 3987 } or do {
3895 warn $@; 3988 error $@;
3896 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3897 }; 3990 };
3898 3991
3899 warn "reloaded"; 3992 info "reloaded";
3900 --$RELOAD; 3993 --$RELOAD;
3901 } 3994 }
3902 3995
3903 $t1 = AE::time - $t1; 3996 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3905}; 3998};
3906 3999
3907our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3908 4001
3909sub reload_perl() { 4002sub reload_perl() {
… …
3930 reload_perl; 4023 reload_perl;
3931 }; 4024 };
3932 } 4025 }
3933}; 4026};
3934 4027
3935unshift @INC, $LIBDIR; 4028#############################################################################
3936 4029
3937my $bug_warning = 0; 4030my $bug_warning = 0;
3938 4031
3939our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3940our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3941 4034
3942sub wait_for_tick { 4035sub wait_for_tick() {
3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3944 4037
3945 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3946 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3947 $signal->wait; 4040 $signal->wait;
3948} 4041}
3949 4042
3950sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3952 4045
3953 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3954 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3955 $signal->wait; 4048 $signal->wait;
… …
3969 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3971 Coro::async_pool { 4064 Coro::async_pool {
3972 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3973 write_runtime_sync 4066 write_runtime_sync
3974 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3975 }; 4068 };
3976 } 4069 }
3977 4070
3978 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3979 $sig->send; 4072 $sig->send;
… …
3987 4080
3988 if (0) { 4081 if (0) {
3989 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3990 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3991 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3992 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3993 } 4086 }
3994 } 4087 }
3995} 4088}
3996 4089
3997{ 4090{

Diff Legend

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