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.526 by root, Wed Apr 21 05:48:35 2010 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 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;
… …
230from wherever your confdir points to. 233from wherever your confdir points to.
231 234
232=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
233 236
234These 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
235returns 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
236per 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();
237 245
238=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
239 247
240This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
241C<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
… …
249 257
250=back 258=back
251 259
252=cut 260=cut
253 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
254$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 269 my $msg = join "", @_;
256 270
257 $msg .= "\n" 271 $msg .= "\n"
258 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
259 273
260 $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;
261 275
262 LOG llevError, $msg; 276 LOG llevWarn, $msg;
263}; 277};
264 278
265$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
267 281
268 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
269 283
270 if (in_main) {#d# 284 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 286 return;#d#
273 }#d# 287 }#d#
274 288
275 # kill coroutine otherwise 289 # kill coroutine otherwise
276 Coro::terminate 290 Coro::terminate
… …
343our $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
344 358
345sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
347 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
348=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
349 375
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
352 378
353The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 380is a reload or not.
355 381
356=cut 382=cut
357 383
358sub post_init(&) { 384sub post_init(&) {
359 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
360} 403}
361 404
362=item cf::lock_wait $string 405=item cf::lock_wait $string
363 406
364Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
509=cut 552=cut
510 553
511sub sync_job(&) { 554sub sync_job(&) {
512 my ($job) = @_; 555 my ($job) = @_;
513 556
514 if ($Coro::current == $Coro::main) { 557 if (in_main) {
515 my $time = AE::time; 558 my $time = AE::time;
516 559
517 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
519 562
520 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
521 564
522 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
523 566
524 my $busy = 1; 567 my $busy = 1;
525 my @res; 568 my @res;
526 569
527 (async { 570 (async {
528 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 572 @res = eval { $job->() };
530 warn $@ if $@; 573 error $@ if $@;
531 undef $busy; 574 undef $busy;
532 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
533 576
534 while ($busy) { 577 while ($busy) {
535 if (Coro::nready) { 578 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
570 613
571 $coro 614 $coro
572} 615}
573 616
574=item fork_call { }, $args 617=item fork_call { }, @args
575 618
576Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 622never block itself or use any form of event handling.
580 623
581=cut 624=cut
582 625
626sub post_fork {
627 reset_signals;
628}
629
583sub fork_call(&@) { 630sub fork_call(&@) {
584 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
585 632
586 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
587 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
589 636
590 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
591 reset_signals; 638 cf::post_fork;
592 &$cb 639 &$cb
593 }, @args; 640 } @args;
594 641
595 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
596} 643}
597 644
598sub objinfo { 645sub objinfo {
… …
648within each server. 695within each server.
649 696
650=cut 697=cut
651 698
652sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
653 my ($name) = @_; 703 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
655 705
656 eval { 706 eval {
657 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
667} 717}
668 718
669our $DB; 719our $DB;
670 720
671sub db_init { 721sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
674 };
675} 723}
676 724
677sub db_get($$) { 725sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
679 727
680 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
681 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
682 732
683 $! ? () 733 $! ? ()
684 : $data 734 : $data
685 }
686} 735}
687 736
688sub db_put($$$) { 737sub db_put($$$) {
689 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
746 795
747 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 797 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
750 799
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 801
753 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
756 805
… …
766 815
767=cut 816=cut
768 817
769sub datalog($@) { 818sub datalog($@) {
770 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 821}
773 822
774=back 823=back
775 824
776=cut 825=cut
… …
971 1020
972 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1023
975 } elsif (ref $type) { 1024 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
977 1026
978 } else { 1027 } else {
979 shift @arg; 1028 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
981 } 1030 }
982 } 1031 }
983} 1032}
984 1033
985sub _object_attach { 1034sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
996 } 1045 }
997 1046
998 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
999 } else { 1048 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1050 }
1002 1051
1003 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
1004} 1053}
1005 1054
… …
1064 1113
1065 for (@$callbacks) { 1114 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1067 1116
1068 if ($@) { 1117 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1119 override;
1072 } 1120 }
1073 1121
1074 return 1 if $override; 1122 return 1 if $override;
1075 } 1123 }
… …
1154 for (@$attach) { 1202 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1157 } 1205 }
1158 } else { 1206 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1208 }
1161 } 1209 }
1162} 1210}
1163 1211
1164cf::attachable->attach ( 1212cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1192 1240
1193 sync_job { 1241 sync_job {
1194 if (length $$rdata) { 1242 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1198 1247
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1225 1274
1226 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1277 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1230 } 1279 }
1231 } else { 1280 } else {
1232 aio_unlink $filename; 1281 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1234 } 1283 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1308 $av = $st->{objs};
1260 } 1309 }
1261 1310
1262 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1265 1315
1266 ($data, $av) 1316 ($data, $av)
1267} 1317}
1268 1318
1269=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1361 1411
1362 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1413 if $reply;
1364 1414
1365 } else { 1415 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1417 }
1368 1418
1369 cf::override; 1419 cf::override;
1370 }, 1420 },
1371); 1421);
… …
1382 1432
1383 $grp 1433 $grp
1384} 1434}
1385 1435
1386sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1387 cf::sync_job { 1439 cf::sync_job {
1388 my %todo; 1440 my %todo;
1389 1441
1390 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1443 next unless -r $path;
… …
1409 1461
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1464
1413 $ext{source} = 1465 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1416 . $source 1468 . $source
1417 . "\n};\n1"; 1469 . "\n};\n1";
1418 1470
1419 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1484 next ext
1433 unless exists $done{$_}; 1485 unless exists $done{$_};
1434 } 1486 }
1435 1487
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1489
1438 my $active = eval $v->{source}; 1490 my $active = eval $v->{source};
1439 1491
1440 if (length $@) { 1492 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1493 error "$v->{path}: $@\n";
1442 1494
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1496 if exists $v->{meta}{mandatory};
1445 1497
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1500 } else {
1449 $done{$k} = delete $todo{$k}; 1501 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1502 push @EXTS, $v->{pkg};
1451 $progress = 1; 1503 $progress = 1;
1452 1504
1453 warn "$v->{base}: extension inactive.\n" 1505 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1506 unless $active;
1455 } 1507 }
1456 } 1508 }
1457 1509
1458 unless ($progress) { 1510 unless ($progress) {
… …
1627 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1628 1680
1629 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1683
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1685 $pl->deactivate;
1686
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1637 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1638 1692
1639 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1807sub generate_random_map { 1861sub generate_random_map {
1808 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1809 1863
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811 1865
1812 # mit "rum" bekleckern, nicht
1813 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817 $rmp->{exit_on_final_map},
1818 $rmp->{xsize}, $rmp->{ysize},
1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824 (cf::region::find $rmp->{region}), $rmp->{custom}
1825 )
1826} 1867}
1827 1868
1828=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1829 1870
1830Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
… …
1835 1876
1836sub register { 1877sub register {
1837 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1879 my $pkg = caller;
1839 1880
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1882
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1884}
1845 1885
… …
1857} 1897}
1858 1898
1859sub normalise { 1899sub normalise {
1860 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1861 1901
1862 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1863 1903
1864 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1865 1905
1866 # map plan: 1906 # map plan:
1867 # 1907 #
… …
1882 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1883 $path = "$base/$path"; 1923 $path = "$base/$path";
1884 } 1924 }
1885 1925
1886 for ($path) { 1926 for ($path) {
1887 redo if s{//}{/};
1888 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1889 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1890 } 1929 }
1891 1930
1892 $path 1931 $path
… …
1906 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1907 return $self; 1946 return $self;
1908 } 1947 }
1909 } 1948 }
1910 1949
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 1951 ()
1913} 1952}
1914 1953
1915sub init { 1954sub init {
1916 my ($self) = @_; 1955 my ($self) = @_;
… …
2038} 2077}
2039 2078
2040sub find; 2079sub find;
2041sub find { 2080sub find {
2042 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
2043 2084
2044 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
2045 2086
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2132 2173
2133 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2134 } 2175 }
2135 2176
2136 $self->post_load; 2177 $self->post_load;
2178
2179 1
2137} 2180}
2138 2181
2139# customize the map for a given player, i.e. 2182# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player 2183# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath 2184# maps to change the path to ~playername/mappath
… …
2162 or next; 2205 or next;
2163 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2164 or next; 2207 or next;
2165 $neigh->load; 2208 $neigh->load;
2166 2209
2210 # now find the diagonal neighbours
2167 push @neigh, 2211 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2214 }
2171 2215
… …
2178} 2222}
2179 2223
2180sub find_sync { 2224sub find_sync {
2181 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2182 2226
2183 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2184} 2231}
2185 2232
2186sub do_load_sync { 2233sub do_load_sync {
2187 my ($map) = @_; 2234 my ($map) = @_;
2188 2235
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2191 2238
2192 cf::sync_job { $map->load }; 2239 $map->load;
2193} 2240}
2194 2241
2195our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2197 2244
… …
2309 2356
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2358
2312 return if $self->players; 2359 return if $self->players;
2313 2360
2314 warn "resetting map ", $self->path, "\n"; 2361 cf::trace "resetting map ", $self->path, "\n";
2315 2362
2316 $self->in_memory (cf::MAP_SWAPPED); 2363 $self->in_memory (cf::MAP_SWAPPED);
2317 2364
2318 # need to save uniques path 2365 # need to save uniques path
2319 unless ($self->{deny_save}) { 2366 unless ($self->{deny_save}) {
… …
2583 2630
2584Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2585 2632
2586The player should be reasonably safe there for short amounts of time (e.g. 2633The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2635though, as the player cannot control the character while it is on the link
2589map. 2636map.
2590 2637
2591Will never block. 2638Will never block.
2592 2639
2593=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2615 my ($self) = @_; 2662 my ($self) = @_;
2616 2663
2617 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2618 2665
2666 ++$self->{_link_recursion};
2667
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2669
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2623 2672
… …
2654 $map->load_neighbours; 2703 $map->load_neighbours;
2655 2704
2656 return unless $self->contr->active; 2705 return unless $self->contr->active;
2657 2706
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2660 2709 # entering was successful
2710 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2711 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2712 $self->activate_recursive;
2663# unless exists $self->{_link_pos}; # maybe we re in-flight again 2713 }
2664}
2665 2714
2715}
2716
2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2667 2718
2668Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2669her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2670that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2671the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
… …
2678 2729
2679our $GOTOGEN; 2730our $GOTOGEN;
2680 2731
2681sub cf::object::player::goto { 2732sub cf::object::player::goto {
2682 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2683 2740
2684 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2685 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2686 2743
2687 $self->enter_link; 2744 $self->enter_link;
… …
2711 my $map = eval { 2768 my $map = eval {
2712 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2713 2770
2714 if ($map) { 2771 if ($map) {
2715 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2716 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2717 } else { 2774 } else {
2718 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2719 } 2776 }
2720 2777
2721 $map 2778 $map
… …
2729 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2730 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2731 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2732 } 2789 }
2733 2790
2734 $done->() if $done; 2791 $done->($self) if $done;
2735 })->prio (1); 2792 })->prio (1);
2736} 2793}
2737 2794
2738=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2739 2796
… …
2832 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2833 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2834 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2835 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2836 2893
2837 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2838 $self->leave_link; 2895 $self->leave_link;
2839 } 2896 }
2840 })->prio (1); 2897 })->prio (1);
2841} 2898}
2842 2899
… …
3155 3212
3156 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3157 if $reply; 3214 if $reply;
3158 3215
3159 } else { 3216 } else {
3160 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3161 } 3218 }
3162 3219
3163 cf::override; 3220 cf::override;
3164 }, 3221 },
3165); 3222);
… …
3246 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3247 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3248 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3249 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3250) { 3307) {
3251 no strict 'refs';
3252 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3254 for @funs; 3310 for @funs;
3255} 3311}
3256 3312
… …
3295 local @cf::_safe_eval_args = values %vars; 3351 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval; 3352 @res = wantarray ? eval eval : scalar eval $eval;
3297 } 3353 }
3298 3354
3299 if ($@) { 3355 if ($@) {
3300 warn "$@"; 3356 warn "$@",
3301 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3302 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3303 } 3359 }
3304 3360
3305 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3306} 3362}
3307 3363
… …
3341 # for this (global event?) 3397 # for this (global event?)
3342 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3343 3399
3344 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3345 3401
3346 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3347 3403
3348 my $facedata;
3349 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3350 or die "$path: $!"; 3405 or die "$path: $!";
3351 3406
3352 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3353 3408
3354 $facedata->{version} == 2 3409 $facedata->{version} == 2
… …
3371 3426
3372 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3373 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3376 3432
3377 cf::cede_to_tick; 3433 cf::cede_to_tick;
3378 } 3434 }
3379 3435
3380 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
… …
3385 3441
3386 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3387 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3389 } else { 3445 } else {
3390 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3391 } 3447 }
3392 3448
3393 cf::cede_to_tick; 3449 cf::cede_to_tick;
3394 } 3450 }
3395 } 3451 }
… …
3413 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3414 3470
3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3416 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3417 } else { 3473 } else {
3418 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3419 } 3475 }
3420 3476
3421 cf::cede_to_tick; 3477 cf::cede_to_tick;
3422 } 3478 }
3423 } 3479 }
3424 3480
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3426 3482
3427 1 3483 1
3428} 3484}
3429
3430cf::global->attach (on_resource_update => sub {
3431 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435 my $sound = $soundconf->{compat}[$_]
3436 or next;
3437
3438 my $face = cf::face::find "sound/$sound->[1]";
3439 cf::sound::set $sound->[0] => $face;
3440 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441 }
3442
3443 while (my ($k, $v) = each %{$soundconf->{event}}) {
3444 my $face = cf::face::find "sound/$v";
3445 cf::sound::set $k => $face;
3446 }
3447 }
3448});
3449 3485
3450register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3451 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3452 3488
3453 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
… …
3492sub reload_treasures { 3528sub reload_treasures {
3493 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3494 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3495} 3531}
3496 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3497sub reload_resources { 3556sub reload_resources {
3498 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3499 3558
3559 reload_exp_table;
3560 reload_materials;
3500 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3501 reload_archetypes; 3563 reload_archetypes;
3502 reload_regions; 3564 reload_regions;
3503 reload_treasures; 3565 reload_treasures;
3504 3566
3505 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3506} 3568}
3507 3569
3508sub reload_config { 3570sub reload_config {
3509 warn "reloading config file...\n"; 3571 trace "reloading config file...\n";
3510 3572
3511 open my $fh, "<:utf8", "$CONFDIR/config" 3573 0 < aio_load "$CONFDIR/config", my $config
3512 or return; 3574 or die "$CONFDIR/config: $!";
3513 3575
3514 local $/; 3576 utf8::decode $config;
3515 *CFG = YAML::XS::Load scalar <$fh>; 3577 *CFG = yaml_load $config;
3516 3578
3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3518 3580
3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3521 3583
3522 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
… …
3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3586 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3525 and die "WARNING: m(un)lockall failed: $!\n"; 3587 and die "WARNING: m(un)lockall failed: $!\n";
3526 }; 3588 };
3527 warn $@ if $@; 3589 warn $@ if $@;
3528 } 3590 }
3529
3530 warn "finished reloading resource files\n";
3531} 3591}
3532 3592
3533sub pidfile() { 3593sub pidfile() {
3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535 or die "$PIDFILE: $!"; 3595 or die "$PIDFILE: $!";
… …
3548 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3549 print $fh $$; 3609 print $fh $$;
3550} 3610}
3551 3611
3552sub main_loop { 3612sub main_loop {
3553 warn "EV::loop starting\n"; 3613 trace "EV::loop starting\n";
3554 if (1) { 3614 if (1) {
3555 EV::loop; 3615 EV::loop;
3556 } 3616 }
3557 warn "EV::loop returned\n"; 3617 trace "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP; 3618 goto &main_loop unless $REALLY_UNLOOP;
3559} 3619}
3560 3620
3561sub main { 3621sub main {
3562 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3563 3623
3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568 3628
3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570 3630
… …
3578 }; 3638 };
3579 3639
3580 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3581 3641
3582 cf::sync_job { 3642 cf::sync_job {
3583 cf::init_experience; 3643 cf::incloader::init ();
3644
3584 cf::init_anim; 3645 cf::init_anim;
3585 cf::init_attackmess; 3646 cf::init_attackmess;
3586 cf::init_dynamic; 3647 cf::init_dynamic;
3587 3648
3588 cf::load_settings; 3649 cf::load_settings;
3589 cf::load_materials;
3590 3650
3591 reload_resources; 3651 reload_resources;
3592 reload_config; 3652 reload_config;
3593 db_init; 3653 db_init;
3594 3654
… …
3606 3666
3607 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3608 use POSIX (); 3668 use POSIX ();
3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3610 3670
3611 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3612 }; 3672 };
3613 3673
3614 cf::object::thawer::errors_are_fatal 0; 3674 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n"; 3675 info "parse errors in files are no longer fatal from this point on.\n";
3616 3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3617 main_loop; 3682 goto &main_loop;
3618} 3683}
3619 3684
3620############################################################################# 3685#############################################################################
3621# initialisation and cleanup 3686# initialisation and cleanup
3622 3687
… …
3661 or return; 3726 or return;
3662 3727
3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3664 and return; 3729 and return;
3665 3730
3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3667 3732
3668 1 3733 1
3669} 3734}
3670 3735
3671our $uuid_lock; 3736our $uuid_lock;
… …
3683 or return; 3748 or return;
3684 3749
3685 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3686 3751
3687 unless ($value) { 3752 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3689 return; 3754 return;
3690 } 3755 }
3691 3756
3692 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3693 $uuid_skip = 0; 3758 $uuid_skip = 0;
… …
3703 or return; 3768 or return;
3704 3769
3705 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3706 and return; 3771 and return;
3707 3772
3708 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3709 3774
3710 1 3775 1
3711 3776
3712} 3777}
3713 3778
… …
3719} 3784}
3720 3785
3721sub emergency_save() { 3786sub emergency_save() {
3722 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3723 3788
3724 warn "emergency_perl_save: enter\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3725 3795
3726 cf::sync_job { 3796 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so 3797 cf::write_runtime_sync; # external watchdog should not bark
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731 3798
3732 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3733 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3734 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3735 warn "emergency_perl_save: begin player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3736 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3737 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3738 $pl->valid or next; 3805 $pl->valid or next;
3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3740 $pl->save; 3807 $pl->save;
3741 } 3808 }
3742 warn "emergency_perl_save: end player save\n"; 3809 info "emergency_perl_save: end player save\n";
3743 3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3744 warn "emergency_perl_save: begin map save\n"; 3813 info "emergency_perl_save: begin map save\n";
3745 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3746 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3747 $map->valid or next; 3816 $map->valid or next;
3748 $map->save; 3817 $map->save;
3749 } 3818 }
3750 warn "emergency_perl_save: end map save\n"; 3819 info "emergency_perl_save: end map save\n";
3751 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3752 warn "emergency_perl_save: begin database checkpoint\n"; 3823 info "emergency_perl_save: begin database checkpoint\n";
3753 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3754 warn "emergency_perl_save: end database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3755 3826
3756 warn "emergency_perl_save: begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3757 write_uuid_sync 1; 3828 write_uuid_sync 1;
3758 warn "emergency_perl_save: end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3759 }; 3849 };
3760 3850
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3766 warn "emergency_perl_save: leave\n"; 3851 info "emergency_perl_save: leave\n";
3767} 3852}
3768 3853
3769sub post_cleanup { 3854sub post_cleanup {
3770 my ($make_core) = @_; 3855 my ($make_core) = @_;
3771 3856
3857 IO::AIO::flush;
3858
3772 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3773 if $make_core; 3860 if $make_core;
3774 3861
3775 my $fh = pidfile; 3862 my $fh = pidfile;
3776 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3777} 3864}
… …
3801 } 3888 }
3802} 3889}
3803 3890
3804sub do_reload_perl() { 3891sub do_reload_perl() {
3805 # can/must only be called in main 3892 # can/must only be called in main
3806 if (in_main) { 3893 unless (in_main) {
3807 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3808 return; 3895 return;
3809 } 3896 }
3810 3897
3811 return if $RELOAD++; 3898 return if $RELOAD++;
3812 3899
3813 my $t1 = AE::time; 3900 my $t1 = AE::time;
3814 3901
3815 while ($RELOAD) { 3902 while ($RELOAD) {
3816 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3817 3905
3818 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3819 3907
3820 cf::sync_job { 3908 cf::sync_job {
3821 cf::write_runtime_sync; # external watchdog should not bark
3822 cf::emergency_save; 3909 #cf::emergency_save;
3823 cf::write_runtime_sync; # external watchdog should not bark
3824 3910
3825 warn "syncing database to disk";
3826 BDB::db_env_txn_checkpoint $DB_ENV;
3827
3828 # if anything goes wrong in here, we should simply crash as we already saved
3829
3830 warn "flushing outstanding aio requests";
3831 while (IO::AIO::nreqs || BDB::nreqs) {
3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3833 }
3834
3835 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3836 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3837 %EXT_CORO = (); 3913 %EXT_CORO = ();
3838 3914
3839 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3840 %COMMAND = (); 3916 %COMMAND = ();
3841 3917
3842 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3843 %EXTCMD = (); 3919 %EXTCMD = ();
3844 %EXTICMD = (); 3920 %EXTICMD = ();
3845 3921
3846 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3847 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3848 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3849 3925
3850 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3851 eval { 3927 eval {
3852 $cb->($pkg); 3928 $cb->($pkg);
3853 1 3929 1
3854 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3855 } 3931 }
3856 3932
3857 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3858 clear_package $pkg; 3934 clear_package $pkg;
3859 } 3935 }
3860 3936
3861 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3862 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3863 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864 3940
3865 warn "... unloading $k"; 3941 trace "... unloading $k";
3866 delete $INC{$k}; 3942 delete $INC{$k};
3867 3943
3868 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3869 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3870 3946
… …
3873 } 3949 }
3874 3950
3875 clear_package $k; 3951 clear_package $k;
3876 } 3952 }
3877 3953
3878 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3879 clear_package "safe::$_" 3955 clear_package "safe::$_"
3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3881 3957
3882 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3883 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3885 3961
3886 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3887 # and global variables created in xs 3963 # and global variables created in xs
3888 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3889 3965
3890 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3891 3967
3892 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3893 require cf; 3969 require cf;
3894 cf::_connect_to_perl_1; 3970 cf::_connect_to_perl_1;
3895 3971
3896 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3897 cf::reload_config; 3973 cf::reload_config;
3898 3974
3899 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3900 cf::load_extensions; 3976 cf::load_extensions;
3901 3977
3902 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3903 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3904 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3905 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3906 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3907 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3908 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3909 } 3985 }
3910 3986
3911 warn "running post_init jobs"; 3987 cf::_post_init 1;
3912 (pop @POST_INIT)->(1) while @POST_INIT;
3913 3988
3914 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3915 3990
3916 1 3991 1
3917 } or do { 3992 } or do {
3918 warn $@; 3993 error $@;
3919 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3920 }; 3995 };
3921 3996
3922 warn "reloaded";
3923 --$RELOAD; 3997 --$RELOAD;
3924 } 3998 }
3925 3999
3926 $t1 = AE::time - $t1; 4000 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3928}; 4002};
3929 4003
3930our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3931 4005
3932sub reload_perl() { 4006sub reload_perl() {
… …
3953 reload_perl; 4027 reload_perl;
3954 }; 4028 };
3955 } 4029 }
3956}; 4030};
3957 4031
3958unshift @INC, $LIBDIR; 4032#############################################################################
3959 4033
3960my $bug_warning = 0; 4034my $bug_warning = 0;
3961 4035
3962our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3963our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3964 4038
3965sub wait_for_tick { 4039sub wait_for_tick() {
3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3967 4041
3968 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3969 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3970 $signal->wait; 4044 $signal->wait;
3971} 4045}
3972 4046
3973sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3975 4049
3976 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3977 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3978 $signal->wait; 4052 $signal->wait;
… …
3992 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3994 Coro::async_pool { 4068 Coro::async_pool {
3995 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3996 write_runtime_sync 4070 write_runtime_sync
3997 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3998 }; 4072 };
3999 } 4073 }
4000 4074
4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4002 $sig->send; 4076 $sig->send;
… …
4010 4084
4011 if (0) { 4085 if (0) {
4012 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
4013 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
4014 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4015 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
4016 } 4090 }
4017 } 4091 }
4018} 4092}
4019 4093
4020{ 4094{
… …
4065 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
4066 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
4067 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
4068} 4142}
4069 4143
4070my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
4071 4146
4072sub _log_backtrace { 4147sub _log_backtrace {
4073 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
4074 4149
4075 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
4076 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4077 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
4078 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
4079 ++$_log_backtrace; 4158 ++$_log_backtrace;
4080 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
4081 async { 4160 async {
4082 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
4083 4162
… …
4103 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
4104 --$_log_backtrace; 4183 --$_log_backtrace;
4105 }; 4184 };
4106 } else { 4185 } else {
4107 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
4108 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4109 } 4188 }
4110} 4189}
4111 4190
4112# load additional modules 4191# load additional modules
4113require "cf/$_.pm" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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