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.518 by root, Fri Apr 16 02:21:26 2010 UTC vs.
Revision 1.550 by root, Fri May 14 22:56:47 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(&) {
355 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 }
356} 403}
357 404
358=item cf::lock_wait $string 405=item cf::lock_wait $string
359 406
360Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
505=cut 552=cut
506 553
507sub sync_job(&) { 554sub sync_job(&) {
508 my ($job) = @_; 555 my ($job) = @_;
509 556
510 if ($Coro::current == $Coro::main) { 557 if (in_main) {
511 my $time = AE::time; 558 my $time = AE::time;
512 559
513 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
515 562
516 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
517 564
518 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
519 566
520 my $busy = 1; 567 my $busy = 1;
521 my @res; 568 my @res;
522 569
523 (async { 570 (async {
524 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 572 @res = eval { $job->() };
526 warn $@ if $@; 573 error $@ if $@;
527 undef $busy; 574 undef $busy;
528 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
529 576
530 while ($busy) { 577 while ($busy) {
531 if (Coro::nready) { 578 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
566 613
567 $coro 614 $coro
568} 615}
569 616
570=item fork_call { }, $args 617=item fork_call { }, @args
571 618
572Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 622never block itself or use any form of event handling.
576 623
577=cut 624=cut
578 625
626sub post_fork {
627 reset_signals;
628}
629
579sub fork_call(&@) { 630sub fork_call(&@) {
580 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
581 632
582 # 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,
583 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
585 636
586 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
587 reset_signals; 638 cf::post_fork;
588 &$cb 639 &$cb
589 }, @args; 640 } @args;
590 641
591 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
592} 643}
593 644
594sub objinfo { 645sub objinfo {
… …
644within each server. 695within each server.
645 696
646=cut 697=cut
647 698
648sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
649 my ($name) = @_; 703 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
651 705
652 eval { 706 eval {
653 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
663} 717}
664 718
665our $DB; 719our $DB;
666 720
667sub db_init { 721sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
670 };
671} 723}
672 724
673sub db_get($$) { 725sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
675 727
676 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
677 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
678 732
679 $! ? () 733 $! ? ()
680 : $data 734 : $data
681 }
682} 735}
683 736
684sub db_put($$$) { 737sub db_put($$$) {
685 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
742 795
743 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 797 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
746 799
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 801
749 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
752 805
… …
762 815
763=cut 816=cut
764 817
765sub datalog($@) { 818sub datalog($@) {
766 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 821}
769 822
770=back 823=back
771 824
772=cut 825=cut
… …
967 1020
968 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1023
971 } elsif (ref $type) { 1024 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
973 1026
974 } else { 1027 } else {
975 shift @arg; 1028 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
977 } 1030 }
978 } 1031 }
979} 1032}
980 1033
981sub _object_attach { 1034sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
992 } 1045 }
993 1046
994 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
995 } else { 1048 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1050 }
998 1051
999 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
1000} 1053}
1001 1054
… …
1060 1113
1061 for (@$callbacks) { 1114 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1063 1116
1064 if ($@) { 1117 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1119 override;
1068 } 1120 }
1069 1121
1070 return 1 if $override; 1122 return 1 if $override;
1071 } 1123 }
… …
1150 for (@$attach) { 1202 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1153 } 1205 }
1154 } else { 1206 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1208 }
1157 } 1209 }
1158} 1210}
1159 1211
1160cf::attachable->attach ( 1212cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1188 1240
1189 sync_job { 1241 sync_job {
1190 if (length $$rdata) { 1242 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1194 1247
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1221 1274
1222 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1277 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1226 } 1279 }
1227 } else { 1280 } else {
1228 aio_unlink $filename; 1281 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1230 } 1283 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1308 $av = $st->{objs};
1256 } 1309 }
1257 1310
1258 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1261 1315
1262 ($data, $av) 1316 ($data, $av)
1263} 1317}
1264 1318
1265=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1357 1411
1358 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1413 if $reply;
1360 1414
1361 } else { 1415 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1417 }
1364 1418
1365 cf::override; 1419 cf::override;
1366 }, 1420 },
1367); 1421);
… …
1378 1432
1379 $grp 1433 $grp
1380} 1434}
1381 1435
1382sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1383 cf::sync_job { 1439 cf::sync_job {
1384 my %todo; 1440 my %todo;
1385 1441
1386 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1443 next unless -r $path;
… …
1405 1461
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1464
1409 $ext{source} = 1465 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1412 . $source 1468 . $source
1413 . "\n};\n1"; 1469 . "\n};\n1";
1414 1470
1415 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1484 next ext
1429 unless exists $done{$_}; 1485 unless exists $done{$_};
1430 } 1486 }
1431 1487
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1489
1434 my $active = eval $v->{source}; 1490 my $active = eval $v->{source};
1435 1491
1436 if (length $@) { 1492 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1493 error "$v->{path}: $@\n";
1438 1494
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1496 if exists $v->{meta}{mandatory};
1497
1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1441 } else { 1500 } else {
1442 $done{$k} = delete $todo{$k}; 1501 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1502 push @EXTS, $v->{pkg};
1444 $progress = 1; 1503 $progress = 1;
1445 1504
1446 warn "$v->{base}: extension inactive.\n" 1505 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1506 unless $active;
1448 } 1507 }
1449 } 1508 }
1450 1509
1451 unless ($progress) { 1510 unless ($progress) {
… …
1620 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1621 1680
1622 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1623 $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
1624 1683
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626 $pl->deactivate; 1685 $pl->deactivate;
1686
1627 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;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1630 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1631 1692
1632 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1634 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1688 \@logins 1749 \@logins
1689} 1750}
1690 1751
1691=item $player->maps 1752=item $player->maps
1692 1753
1754=item cf::player::maps $login
1755
1693Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1694player. May block. 1757player. May block.
1695 1758
1696=cut 1759=cut
1697 1760
… …
1758 1821
1759=cut 1822=cut
1760 1823
1761sub find_by_path($) { 1824sub find_by_path($) {
1762 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1763 1828
1764 my ($match, $specificity); 1829 my ($match, $specificity);
1765 1830
1766 for my $region (list) { 1831 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
… …
1824 1889
1825sub register { 1890sub register {
1826 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 1892 my $pkg = caller;
1828 1893
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 1895
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1897}
1834 1898
1835# also paths starting with '/' 1899# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1901
1838sub thawer_merge { 1902sub thawer_merge {
1839 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1840 1904
1841 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1846} 1910}
1847 1911
1848sub normalise { 1912sub normalise {
1849 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1850 1914
1851 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1852 1916
1853 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1854 1918
1855 # map plan: 1919 # map plan:
1856 # 1920 #
… …
1895 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1896 return $self; 1960 return $self;
1897 } 1961 }
1898 } 1962 }
1899 1963
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 1965 ()
1902} 1966}
1903 1967
1904sub init { 1968sub init {
1905 my ($self) = @_; 1969 my ($self) = @_;
… …
2027} 2091}
2028 2092
2029sub find; 2093sub find;
2030sub find { 2094sub find {
2031 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2096
2097 cf::cede_to_tick;
2032 2098
2033 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
2034 2100
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2151 or next; 2217 or next;
2152 $neigh = find $neigh, $map 2218 $neigh = find $neigh, $map
2153 or next; 2219 or next;
2154 $neigh->load; 2220 $neigh->load;
2155 2221
2222 # now find the diagonal neighbours
2156 push @neigh, 2223 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2224 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2225 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 } 2226 }
2160 2227
… …
2167} 2234}
2168 2235
2169sub find_sync { 2236sub find_sync {
2170 my ($path, $origin) = @_; 2237 my ($path, $origin) = @_;
2171 2238
2172 cf::sync_job { find $path, $origin } 2239 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2240 if $Coro::current == $Coro::main;
2241
2242 find $path, $origin
2173} 2243}
2174 2244
2175sub do_load_sync { 2245sub do_load_sync {
2176 my ($map) = @_; 2246 my ($map) = @_;
2177 2247
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2249 if $Coro::current == $Coro::main;
2180 2250
2181 cf::sync_job { $map->load }; 2251 $map->load;
2182} 2252}
2183 2253
2184our %MAP_PREFETCH; 2254our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2255our $MAP_PREFETCHER = undef;
2186 2256
… …
2298 2368
2299 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2369 my $lock = cf::lock_acquire "map_data:$self->{path}";
2300 2370
2301 return if $self->players; 2371 return if $self->players;
2302 2372
2303 warn "resetting map ", $self->path, "\n"; 2373 cf::trace "resetting map ", $self->path, "\n";
2304 2374
2305 $self->in_memory (cf::MAP_SWAPPED); 2375 $self->in_memory (cf::MAP_SWAPPED);
2306 2376
2307 # need to save uniques path 2377 # need to save uniques path
2308 unless ($self->{deny_save}) { 2378 unless ($self->{deny_save}) {
… …
2332 2402
2333 delete $cf::MAP{$self->path}; 2403 delete $cf::MAP{$self->path};
2334 2404
2335 $self->unlink_save; 2405 $self->unlink_save;
2336 2406
2337 bless $self, "cf::map"; 2407 bless $self, "cf::map::wrap";
2338 delete $self->{deny_reset}; 2408 delete $self->{deny_reset};
2339 $self->{deny_save} = 1; 2409 $self->{deny_save} = 1;
2340 $self->reset_timeout (1); 2410 $self->reset_timeout (1);
2341 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2411 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2342 2412
… …
2572 2642
2573Freezes the player and moves him/her to a special map (C<{link}>). 2643Freezes the player and moves him/her to a special map (C<{link}>).
2574 2644
2575The player should be reasonably safe there for short amounts of time (e.g. 2645The player should be reasonably safe there for short amounts of time (e.g.
2576for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2646for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link 2647though, as the player cannot control the character while it is on the link
2578map. 2648map.
2579 2649
2580Will never block. 2650Will never block.
2581 2651
2582=item $player_object->leave_link ($map, $x, $y) 2652=item $player_object->leave_link ($map, $x, $y)
… …
2603sub cf::object::player::enter_link { 2673sub cf::object::player::enter_link {
2604 my ($self) = @_; 2674 my ($self) = @_;
2605 2675
2606 $self->deactivate_recursive; 2676 $self->deactivate_recursive;
2607 2677
2678 ++$self->{_link_recursion};
2679
2608 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2680 return if UNIVERSAL::isa $self->map, "ext::map_link";
2609 2681
2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2682 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2611 if $self->map && $self->map->{path} ne "{link}"; 2683 if $self->map && $self->map->{path} ne "{link}";
2612 2684
2613 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2685 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2614} 2686}
2615 2687
2616sub cf::object::player::leave_link { 2688sub cf::object::player::leave_link {
2617 my ($self, $map, $x, $y) = @_; 2689 my ($self, $map, $x, $y) = @_;
2618 2690
… …
2643 $map->load_neighbours; 2715 $map->load_neighbours;
2644 2716
2645 return unless $self->contr->active; 2717 return unless $self->contr->active;
2646 2718
2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2719 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2648 $self->enter_map ($map, $x, $y); 2720 if ($self->enter_map ($map, $x, $y)) {
2649 2721 # entering was successful
2722 delete $self->{_link_recursion};
2650 # only activate afterwards, to support waiting in hooks 2723 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive; 2724 $self->activate_recursive;
2652} 2725 }
2653 2726
2727}
2728
2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2729=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2655 2730
2656Moves the player to the given map-path and coordinates by first freezing 2731Moves the player to the given map-path and coordinates by first freezing
2657her, loading and preparing them map, calling the provided $check callback 2732her, loading and preparing them map, calling the provided $check callback
2658that has to return the map if sucecssful, and then unfreezes the player on 2733that has to return the map if sucecssful, and then unfreezes the player on
2659the new (success) or old (failed) map position. In either case, $done will 2734the new (success) or old (failed) map position. In either case, $done will
… …
2666 2741
2667our $GOTOGEN; 2742our $GOTOGEN;
2668 2743
2669sub cf::object::player::goto { 2744sub cf::object::player::goto {
2670 my ($self, $path, $x, $y, $check, $done) = @_; 2745 my ($self, $path, $x, $y, $check, $done) = @_;
2746
2747 if ($self->{_link_recursion} >= $MAX_LINKS) {
2748 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2749 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2750 ($path, $x, $y) = @$EMERGENCY_POSITION;
2751 }
2671 2752
2672 # do generation counting so two concurrent goto's will be executed in-order 2753 # do generation counting so two concurrent goto's will be executed in-order
2673 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2754 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2674 2755
2675 $self->enter_link; 2756 $self->enter_link;
… …
2699 my $map = eval { 2780 my $map = eval {
2700 my $map = defined $path ? cf::map::find $path : undef; 2781 my $map = defined $path ? cf::map::find $path : undef;
2701 2782
2702 if ($map) { 2783 if ($map) {
2703 $map = $map->customise_for ($self); 2784 $map = $map->customise_for ($self);
2704 $map = $check->($map) if $check && $map; 2785 $map = $check->($map, $x, $y, $self) if $check && $map;
2705 } else { 2786 } else {
2706 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2787 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2707 } 2788 }
2708 2789
2709 $map 2790 $map
… …
2717 if ($gen == $self->{_goto_generation}) { 2798 if ($gen == $self->{_goto_generation}) {
2718 delete $self->{_goto_generation}; 2799 delete $self->{_goto_generation};
2719 $self->leave_link ($map, $x, $y); 2800 $self->leave_link ($map, $x, $y);
2720 } 2801 }
2721 2802
2722 $done->() if $done; 2803 $done->($self) if $done;
2723 })->prio (1); 2804 })->prio (1);
2724} 2805}
2725 2806
2726=item $player_object->enter_exit ($exit_object) 2807=item $player_object->enter_exit ($exit_object)
2727 2808
… …
2820 $self->message ("Something went wrong deep within the deliantra server. " 2901 $self->message ("Something went wrong deep within the deliantra server. "
2821 . "I'll try to bring you back to the map you were before. " 2902 . "I'll try to bring you back to the map you were before. "
2822 . "Please report this to the dungeon master!", 2903 . "Please report this to the dungeon master!",
2823 cf::NDI_UNIQUE | cf::NDI_RED); 2904 cf::NDI_UNIQUE | cf::NDI_RED);
2824 2905
2825 warn "ERROR in enter_exit: $@"; 2906 error "ERROR in enter_exit: $@";
2826 $self->leave_link; 2907 $self->leave_link;
2827 } 2908 }
2828 })->prio (1); 2909 })->prio (1);
2829} 2910}
2830 2911
… …
3143 3224
3144 $ns->ext_reply ($reply, @reply) 3225 $ns->ext_reply ($reply, @reply)
3145 if $reply; 3226 if $reply;
3146 3227
3147 } else { 3228 } else {
3148 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3229 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3149 } 3230 }
3150 3231
3151 cf::override; 3232 cf::override;
3152 }, 3233 },
3153); 3234);
… …
3234 decrease split destroy change_exp value msg lore send_msg)], 3315 decrease split destroy change_exp value msg lore send_msg)],
3235 ["cf::object::player" => qw(player)], 3316 ["cf::object::player" => qw(player)],
3236 ["cf::player" => qw(peaceful send_msg)], 3317 ["cf::player" => qw(peaceful send_msg)],
3237 ["cf::map" => qw(trigger)], 3318 ["cf::map" => qw(trigger)],
3238) { 3319) {
3239 no strict 'refs';
3240 my ($pkg, @funs) = @$_; 3320 my ($pkg, @funs) = @$_;
3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3321 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3242 for @funs; 3322 for @funs;
3243} 3323}
3244 3324
… …
3283 local @cf::_safe_eval_args = values %vars; 3363 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval; 3364 @res = wantarray ? eval eval : scalar eval $eval;
3285 } 3365 }
3286 3366
3287 if ($@) { 3367 if ($@) {
3288 warn "$@"; 3368 warn "$@",
3289 warn "while executing safe code '$code'\n"; 3369 "while executing safe code '$code'\n",
3290 warn "with arguments " . (join " ", %vars) . "\n"; 3370 "with arguments " . (join " ", %vars) . "\n";
3291 } 3371 }
3292 3372
3293 wantarray ? @res : $res[0] 3373 wantarray ? @res : $res[0]
3294} 3374}
3295 3375
… …
3329 # for this (global event?) 3409 # for this (global event?)
3330 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3331 3411
3332 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3333 3413
3334 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3335 3415
3336 my $facedata;
3337 0 < aio_load $path, $facedata 3416 0 < aio_load $path, my $facedata
3338 or die "$path: $!"; 3417 or die "$path: $!";
3339 3418
3340 $facedata = Coro::Storable::thaw $facedata; 3419 $facedata = Coro::Storable::thaw $facedata;
3341 3420
3342 $facedata->{version} == 2 3421 $facedata->{version} == 2
… …
3373 3452
3374 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3375 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3376 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3377 } else { 3456 } else {
3378 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3379 } 3458 }
3380 3459
3381 cf::cede_to_tick; 3460 cf::cede_to_tick;
3382 } 3461 }
3383 } 3462 }
… …
3401 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3402 3481
3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3404 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3405 } else { 3484 } else {
3406 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3407 } 3486 }
3408 3487
3409 cf::cede_to_tick; 3488 cf::cede_to_tick;
3410 } 3489 }
3411 } 3490 }
3412 3491
3413 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3414 3493
3415 1 3494 1
3416} 3495}
3417
3418cf::global->attach (on_resource_update => sub {
3419 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423 my $sound = $soundconf->{compat}[$_]
3424 or next;
3425
3426 my $face = cf::face::find "sound/$sound->[1]";
3427 cf::sound::set $sound->[0] => $face;
3428 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429 }
3430
3431 while (my ($k, $v) = each %{$soundconf->{event}}) {
3432 my $face = cf::face::find "sound/$v";
3433 cf::sound::set $k => $face;
3434 }
3435 }
3436});
3437 3496
3438register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3439 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3440 3499
3441 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
… …
3480sub reload_treasures { 3539sub reload_treasures {
3481 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3482 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3483} 3542}
3484 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3485sub reload_resources { 3567sub reload_resources {
3486 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3487 3569
3570 reload_exp_table;
3571 reload_materials;
3488 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3489 reload_archetypes; 3574 reload_archetypes;
3490 reload_regions; 3575 reload_regions;
3491 reload_treasures; 3576 reload_treasures;
3492 3577
3493 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3494} 3579}
3495 3580
3496sub reload_config { 3581sub reload_config {
3497 warn "reloading config file...\n"; 3582 trace "reloading config file...\n";
3498 3583
3499 open my $fh, "<:utf8", "$CONFDIR/config" 3584 0 < aio_load "$CONFDIR/config", my $config
3500 or return; 3585 or die "$CONFDIR/config: $!";
3501 3586
3502 local $/; 3587 utf8::decode $config;
3503 *CFG = YAML::XS::Load scalar <$fh>; 3588 *CFG = yaml_load $config;
3504 3589
3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3506 3591
3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3509 3594
3510 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
… …
3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3513 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3514 }; 3599 };
3515 warn $@ if $@; 3600 warn $@ if $@;
3516 } 3601 }
3517
3518 warn "finished reloading resource files\n";
3519} 3602}
3520 3603
3521sub pidfile() { 3604sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!"; 3606 or die "$PIDFILE: $!";
… …
3536 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3537 print $fh $$; 3620 print $fh $$;
3538} 3621}
3539 3622
3540sub main_loop { 3623sub main_loop {
3541 warn "EV::loop starting\n"; 3624 trace "EV::loop starting\n";
3542 if (1) { 3625 if (1) {
3543 EV::loop; 3626 EV::loop;
3544 } 3627 }
3545 warn "EV::loop returned\n"; 3628 trace "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP; 3629 goto &main_loop unless $REALLY_UNLOOP;
3547} 3630}
3548 3631
3549sub main { 3632sub main {
3550 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3551 3634
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556 3639
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558 3641
… …
3566 }; 3649 };
3567 3650
3568 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3569 3652
3570 cf::sync_job { 3653 cf::sync_job {
3571 cf::init_experience; 3654 cf::incloader::init ();
3655
3572 cf::init_anim; 3656 cf::init_anim;
3573 cf::init_attackmess; 3657 cf::init_attackmess;
3574 cf::init_dynamic; 3658 cf::init_dynamic;
3575 3659
3576 cf::load_settings; 3660 cf::load_settings;
3577 cf::load_materials;
3578 3661
3579 reload_resources; 3662 reload_resources;
3580 reload_config; 3663 reload_config;
3581 db_init; 3664 db_init;
3582 3665
… …
3594 3677
3595 # no (long-running) fork's whatsoever before this point(!) 3678 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX (); 3679 use POSIX ();
3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3680 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598 3681
3599 (pop @POST_INIT)->(0) while @POST_INIT; 3682 cf::_post_init 0;
3600 }; 3683 };
3601 3684
3602 cf::object::thawer::errors_are_fatal 0; 3685 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n"; 3686 info "parse errors in files are no longer fatal from this point on.\n";
3604 3687
3688 my $free_main; $free_main = EV::idle sub {
3689 undef $free_main;
3690 undef &main; # free gobs of memory :)
3691 };
3692
3605 main_loop; 3693 goto &main_loop;
3606} 3694}
3607 3695
3608############################################################################# 3696#############################################################################
3609# initialisation and cleanup 3697# initialisation and cleanup
3610 3698
… …
3649 or return; 3737 or return;
3650 3738
3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3739 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3652 and return; 3740 and return;
3653 3741
3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3742 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3655 3743
3656 1 3744 1
3657} 3745}
3658 3746
3659our $uuid_lock; 3747our $uuid_lock;
… …
3671 or return; 3759 or return;
3672 3760
3673 my $value = uuid_seq uuid_cur; 3761 my $value = uuid_seq uuid_cur;
3674 3762
3675 unless ($value) { 3763 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n"; 3764 info "cowardly refusing to write zero uuid value!\n";
3677 return; 3765 return;
3678 } 3766 }
3679 3767
3680 my $value = uuid_str $value + $uuid_skip; 3768 my $value = uuid_str $value + $uuid_skip;
3681 $uuid_skip = 0; 3769 $uuid_skip = 0;
… …
3691 or return; 3779 or return;
3692 3780
3693 aio_rename "$uuid~", $uuid 3781 aio_rename "$uuid~", $uuid
3694 and return; 3782 and return;
3695 3783
3696 warn "uuid file written ($value).\n"; 3784 trace "uuid file written ($value).\n";
3697 3785
3698 1 3786 1
3699 3787
3700} 3788}
3701 3789
… …
3707} 3795}
3708 3796
3709sub emergency_save() { 3797sub emergency_save() {
3710 my $freeze_guard = cf::freeze_mainloop; 3798 my $freeze_guard = cf::freeze_mainloop;
3711 3799
3712 warn "emergency_perl_save: enter\n"; 3800 info "emergency_perl_save: enter\n";
3801
3802 # this is a trade-off: we want to be very quick here, so
3803 # save all maps without fsync, and later call a global sync
3804 # (which in turn might be very very slow)
3805 local $USE_FSYNC = 0;
3713 3806
3714 cf::sync_job { 3807 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so 3808 cf::write_runtime_sync; # external watchdog should not bark
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719 3809
3720 # use a peculiar iteration method to avoid tripping on perl 3810 # use a peculiar iteration method to avoid tripping on perl
3721 # refcount bugs in for. also avoids problems with players 3811 # refcount bugs in for. also avoids problems with players
3722 # and maps saved/destroyed asynchronously. 3812 # and maps saved/destroyed asynchronously.
3723 warn "emergency_perl_save: begin player save\n"; 3813 info "emergency_perl_save: begin player save\n";
3724 for my $login (keys %cf::PLAYER) { 3814 for my $login (keys %cf::PLAYER) {
3725 my $pl = $cf::PLAYER{$login} or next; 3815 my $pl = $cf::PLAYER{$login} or next;
3726 $pl->valid or next; 3816 $pl->valid or next;
3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3817 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3728 $pl->save; 3818 $pl->save;
3729 } 3819 }
3730 warn "emergency_perl_save: end player save\n"; 3820 info "emergency_perl_save: end player save\n";
3731 3821
3822 cf::write_runtime_sync; # external watchdog should not bark
3823
3732 warn "emergency_perl_save: begin map save\n"; 3824 info "emergency_perl_save: begin map save\n";
3733 for my $path (keys %cf::MAP) { 3825 for my $path (keys %cf::MAP) {
3734 my $map = $cf::MAP{$path} or next; 3826 my $map = $cf::MAP{$path} or next;
3735 $map->valid or next; 3827 $map->valid or next;
3736 $map->save; 3828 $map->save;
3737 } 3829 }
3738 warn "emergency_perl_save: end map save\n"; 3830 info "emergency_perl_save: end map save\n";
3739 3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3740 warn "emergency_perl_save: begin database checkpoint\n"; 3834 info "emergency_perl_save: begin database checkpoint\n";
3741 BDB::db_env_txn_checkpoint $DB_ENV; 3835 BDB::db_env_txn_checkpoint $DB_ENV;
3742 warn "emergency_perl_save: end database checkpoint\n"; 3836 info "emergency_perl_save: end database checkpoint\n";
3743 3837
3744 warn "emergency_perl_save: begin write uuid\n"; 3838 info "emergency_perl_save: begin write uuid\n";
3745 write_uuid_sync 1; 3839 write_uuid_sync 1;
3746 warn "emergency_perl_save: end write uuid\n"; 3840 info "emergency_perl_save: end write uuid\n";
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3844 trace "emergency_perl_save: syncing database to disk";
3845 BDB::db_env_txn_checkpoint $DB_ENV;
3846
3847 info "emergency_perl_save: starting sync\n";
3848 IO::AIO::aio_sync sub {
3849 info "emergency_perl_save: finished sync\n";
3850 };
3851
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3854 trace "emergency_perl_save: flushing outstanding aio requests";
3855 while (IO::AIO::nreqs || BDB::nreqs) {
3856 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3857 }
3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3747 }; 3860 };
3748 3861
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3754 warn "emergency_perl_save: leave\n"; 3862 info "emergency_perl_save: leave\n";
3755} 3863}
3756 3864
3757sub post_cleanup { 3865sub post_cleanup {
3758 my ($make_core) = @_; 3866 my ($make_core) = @_;
3759 3867
3868 IO::AIO::flush;
3869
3760 warn Carp::longmess "post_cleanup backtrace" 3870 error Carp::longmess "post_cleanup backtrace"
3761 if $make_core; 3871 if $make_core;
3762 3872
3763 my $fh = pidfile; 3873 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$; 3874 unlink $PIDFILE if <$fh> == $$;
3765} 3875}
… …
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3895 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) { 3896 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"}; 3897 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3898# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 } 3899 }
3790 warn "cleared package $pkg\n";#d#
3791} 3900}
3792 3901
3793sub do_reload_perl() { 3902sub do_reload_perl() {
3794 # can/must only be called in main 3903 # can/must only be called in main
3795 if ($Coro::current != $Coro::main) { 3904 unless (in_main) {
3796 warn "can only reload from main coroutine"; 3905 error "can only reload from main coroutine";
3797 return; 3906 return;
3798 } 3907 }
3799 3908
3800 return if $RELOAD++; 3909 return if $RELOAD++;
3801 3910
3802 my $t1 = AE::time; 3911 my $t1 = AE::time;
3803 3912
3804 while ($RELOAD) { 3913 while ($RELOAD) {
3805 warn "reloading..."; 3914 cf::get_slot 0.1, -1, "reload_perl";
3915 info "perl_reload: reloading...";
3806 3916
3807 warn "entering sync_job"; 3917 trace "perl_reload: entering sync_job";
3808 3918
3809 cf::sync_job { 3919 cf::sync_job {
3810 cf::write_runtime_sync; # external watchdog should not bark
3811 cf::emergency_save; 3920 #cf::emergency_save;
3812 cf::write_runtime_sync; # external watchdog should not bark
3813 3921
3814 warn "syncing database to disk";
3815 BDB::db_env_txn_checkpoint $DB_ENV;
3816
3817 # if anything goes wrong in here, we should simply crash as we already saved
3818
3819 warn "flushing outstanding aio requests";
3820 while (IO::AIO::nreqs || BDB::nreqs) {
3821 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3822 }
3823
3824 warn "cancelling all extension coros"; 3922 trace "perl_reload: cancelling all extension coros";
3825 $_->cancel for values %EXT_CORO; 3923 $_->cancel for values %EXT_CORO;
3826 %EXT_CORO = (); 3924 %EXT_CORO = ();
3827 3925
3828 warn "removing commands"; 3926 trace "perl_reload: removing commands";
3829 %COMMAND = (); 3927 %COMMAND = ();
3830 3928
3831 warn "removing ext/exti commands"; 3929 trace "perl_reload: removing ext/exti commands";
3832 %EXTCMD = (); 3930 %EXTCMD = ();
3833 %EXTICMD = (); 3931 %EXTICMD = ();
3834 3932
3835 warn "unloading/nuking all extensions"; 3933 trace "perl_reload: unloading/nuking all extensions";
3836 for my $pkg (@EXTS) { 3934 for my $pkg (@EXTS) {
3837 warn "... unloading $pkg"; 3935 trace "... unloading $pkg";
3838 3936
3839 if (my $cb = $pkg->can ("unload")) { 3937 if (my $cb = $pkg->can ("unload")) {
3840 eval { 3938 eval {
3841 $cb->($pkg); 3939 $cb->($pkg);
3842 1 3940 1
3843 } or warn "$pkg unloaded, but with errors: $@"; 3941 } or error "$pkg unloaded, but with errors: $@";
3844 } 3942 }
3845 3943
3846 warn "... clearing $pkg"; 3944 trace "... clearing $pkg";
3847 clear_package $pkg; 3945 clear_package $pkg;
3848 } 3946 }
3849 3947
3850 warn "unloading all perl modules loaded from $LIBDIR"; 3948 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3851 while (my ($k, $v) = each %INC) { 3949 while (my ($k, $v) = each %INC) {
3852 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3950 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853 3951
3854 warn "... unloading $k"; 3952 trace "... unloading $k";
3855 delete $INC{$k}; 3953 delete $INC{$k};
3856 3954
3857 $k =~ s/\.pm$//; 3955 $k =~ s/\.pm$//;
3858 $k =~ s/\//::/g; 3956 $k =~ s/\//::/g;
3859 3957
… …
3862 } 3960 }
3863 3961
3864 clear_package $k; 3962 clear_package $k;
3865 } 3963 }
3866 3964
3867 warn "getting rid of safe::, as good as possible"; 3965 trace "perl_reload: getting rid of safe::, as good as possible";
3868 clear_package "safe::$_" 3966 clear_package "safe::$_"
3869 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3967 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3870 3968
3871 warn "unloading cf.pm \"a bit\""; 3969 trace "perl_reload: unloading cf.pm \"a bit\"";
3872 delete $INC{"cf.pm"}; 3970 delete $INC{"cf.pm"};
3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3971 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3874 3972
3875 # don't, removes xs symbols, too, 3973 # don't, removes xs symbols, too,
3876 # and global variables created in xs 3974 # and global variables created in xs
3877 #clear_package __PACKAGE__; 3975 #clear_package __PACKAGE__;
3878 3976
3879 warn "unload completed, starting to reload now"; 3977 info "perl_reload: unload completed, starting to reload now";
3880 3978
3881 warn "reloading cf.pm"; 3979 trace "perl_reload: reloading cf.pm";
3882 require cf; 3980 require cf;
3883 cf::_connect_to_perl_1; 3981 cf::_connect_to_perl_1;
3884 3982
3885 warn "loading config and database again"; 3983 trace "perl_reload: loading config and database again";
3886 cf::reload_config; 3984 cf::reload_config;
3887 3985
3888 warn "loading extensions"; 3986 trace "perl_reload: loading extensions";
3889 cf::load_extensions; 3987 cf::load_extensions;
3890 3988
3891 if ($REATTACH_ON_RELOAD) { 3989 if ($REATTACH_ON_RELOAD) {
3892 warn "reattaching attachments to objects/players"; 3990 trace "perl_reload: reattaching attachments to objects/players";
3893 _global_reattach; # objects, sockets 3991 _global_reattach; # objects, sockets
3894 warn "reattaching attachments to maps"; 3992 trace "perl_reload: reattaching attachments to maps";
3895 reattach $_ for values %MAP; 3993 reattach $_ for values %MAP;
3896 warn "reattaching attachments to players"; 3994 trace "perl_reload: reattaching attachments to players";
3897 reattach $_ for values %PLAYER; 3995 reattach $_ for values %PLAYER;
3898 } 3996 }
3899 3997
3900 warn "running post_init jobs"; 3998 cf::_post_init 1;
3901 (pop @POST_INIT)->(1) while @POST_INIT;
3902 3999
3903 warn "leaving sync_job"; 4000 trace "perl_reload: leaving sync_job";
3904 4001
3905 1 4002 1
3906 } or do { 4003 } or do {
3907 warn $@; 4004 error $@;
3908 cf::cleanup "error while reloading, exiting."; 4005 cf::cleanup "perl_reload: error, exiting.";
3909 }; 4006 };
3910 4007
3911 warn "reloaded";
3912 --$RELOAD; 4008 --$RELOAD;
3913 } 4009 }
3914 4010
3915 $t1 = AE::time - $t1; 4011 $t1 = AE::time - $t1;
3916 warn "reload completed in ${t1}s\n"; 4012 info "perl_reload: completed in ${t1}s\n";
3917}; 4013};
3918 4014
3919our $RELOAD_WATCHER; # used only during reload 4015our $RELOAD_WATCHER; # used only during reload
3920 4016
3921sub reload_perl() { 4017sub reload_perl() {
… …
3942 reload_perl; 4038 reload_perl;
3943 }; 4039 };
3944 } 4040 }
3945}; 4041};
3946 4042
3947unshift @INC, $LIBDIR; 4043#############################################################################
3948 4044
3949my $bug_warning = 0; 4045my $bug_warning = 0;
3950 4046
3951our @WAIT_FOR_TICK; 4047our @WAIT_FOR_TICK;
3952our @WAIT_FOR_TICK_BEGIN; 4048our @WAIT_FOR_TICK_BEGIN;
3953 4049
3954sub wait_for_tick { 4050sub wait_for_tick() {
3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3956 4052
3957 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3958 push @WAIT_FOR_TICK, $signal; 4054 push @WAIT_FOR_TICK, $signal;
3959 $signal->wait; 4055 $signal->wait;
3960} 4056}
3961 4057
3962sub wait_for_tick_begin { 4058sub wait_for_tick_begin() {
3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3964 4060
3965 my $signal = new Coro::Signal; 4061 my $signal = new Coro::Signal;
3966 push @WAIT_FOR_TICK_BEGIN, $signal; 4062 push @WAIT_FOR_TICK_BEGIN, $signal;
3967 $signal->wait; 4063 $signal->wait;
… …
3981 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4077 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4078 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3983 Coro::async_pool { 4079 Coro::async_pool {
3984 $Coro::current->{desc} = "runtime saver"; 4080 $Coro::current->{desc} = "runtime saver";
3985 write_runtime_sync 4081 write_runtime_sync
3986 or warn "ERROR: unable to write runtime file: $!"; 4082 or error "ERROR: unable to write runtime file: $!";
3987 }; 4083 };
3988 } 4084 }
3989 4085
3990 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3991 $sig->send; 4087 $sig->send;
… …
3999 4095
4000 if (0) { 4096 if (0) {
4001 if ($NEXT_TICK) { 4097 if ($NEXT_TICK) {
4002 my $jitter = $TICK_START - $NEXT_TICK; 4098 my $jitter = $TICK_START - $NEXT_TICK;
4003 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4099 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4004 warn "jitter $JITTER\n";#d# 4100 debug "jitter $JITTER\n";#d#
4005 } 4101 }
4006 } 4102 }
4007} 4103}
4008 4104
4009{ 4105{

Diff Legend

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