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.527 by root, Fri Apr 23 04:32:47 2010 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 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 = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 0;#d# 119our $VERBOSE_IO = 1;
118 120
119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
121our $NEXT_TICK; 123our $NEXT_TICK;
122our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME;
… …
233from wherever your confdir points to. 235from wherever your confdir points to.
234 236
235=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
236 238
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
240 247
241=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
242 249
243This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
252 259
253=back 260=back
254 261
255=cut 262=cut
256 263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
257$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 271 my $msg = join "", @_;
259 272
260 $msg .= "\n" 273 $msg .= "\n"
261 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
262 275
263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
264 277
265 LOG llevError, $msg; 278 LOG llevWarn, $msg;
266}; 279};
267 280
268$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
270 283
271 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
272 285
273 if (in_main) {#d# 286 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 288 return;#d#
276 }#d# 289 }#d#
277 290
278 # kill coroutine otherwise 291 # kill coroutine otherwise
279 Coro::terminate 292 Coro::terminate
… …
346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
347 360
348sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
349sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
350 363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
351=item cf::post_init { BLOCK } 376=item cf::post_init { BLOCK }
352 377
353Execute the given codeblock, I<after> all extensions have been (re-)loaded, 378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again. 379but I<before> the server starts ticking again.
355 380
356The cdoeblock will have a single boolean argument to indicate whether this 381The codeblock will have a single boolean argument to indicate whether this
357is a reload or not. 382is a reload or not.
358 383
359=cut 384=cut
360 385
361sub post_init(&) { 386sub post_init(&) {
362 push @POST_INIT, shift; 387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
363} 405}
364 406
365=item cf::lock_wait $string 407=item cf::lock_wait $string
366 408
367Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
… …
512=cut 554=cut
513 555
514sub sync_job(&) { 556sub sync_job(&) {
515 my ($job) = @_; 557 my ($job) = @_;
516 558
517 if ($Coro::current == $Coro::main) { 559 if (in_main) {
518 my $time = AE::time; 560 my $time = AE::time;
519 561
520 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
522 564
523 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
524 566
525 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
526 568
527 my $busy = 1; 569 my $busy = 1;
528 my @res; 570 my @res;
529 571
530 (async { 572 (async {
531 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 574 @res = eval { $job->() };
533 warn $@ if $@; 575 error $@ if $@;
534 undef $busy; 576 undef $busy;
535 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
536 578
537 while ($busy) { 579 while ($busy) {
538 if (Coro::nready) { 580 if (Coro::nready) {
… …
572 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
573 615
574 $coro 616 $coro
575} 617}
576 618
577=item fork_call { }, $args 619=item fork_call { }, @args
578 620
579Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
580process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
581Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 624never block itself or use any form of event handling.
583 625
584=cut 626=cut
585 627
628sub post_fork {
629 reset_signals;
630}
631
586sub fork_call(&@) { 632sub fork_call(&@) {
587 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
588 634
589 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
590 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
592 638
593 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
594 reset_signals; 640 cf::post_fork;
595 &$cb 641 &$cb
596 }, @args; 642 } @args;
597 643
598 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
599} 645}
600 646
601sub objinfo { 647sub objinfo {
… …
651within each server. 697within each server.
652 698
653=cut 699=cut
654 700
655sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
656 my ($name) = @_; 705 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
658 707
659 eval { 708 eval {
660 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
… …
670} 719}
671 720
672our $DB; 721our $DB;
673 722
674sub db_init { 723sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
677 };
678} 725}
679 726
680sub db_get($$) { 727sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
682 729
683 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
684 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
685 734
686 $! ? () 735 $! ? ()
687 : $data 736 : $data
688 }
689} 737}
690 738
691sub db_put($$$) { 739sub db_put($$$) {
692 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
749 797
750 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 799 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
753 801
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 803
756 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
759 807
… …
769 817
770=cut 818=cut
771 819
772sub datalog($@) { 820sub datalog($@) {
773 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 823}
776 824
777=back 825=back
778 826
779=cut 827=cut
… …
974 1022
975 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 1025
978 } elsif (ref $type) { 1026 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
980 1028
981 } else { 1029 } else {
982 shift @arg; 1030 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
984 } 1032 }
985 } 1033 }
986} 1034}
987 1035
988sub _object_attach { 1036sub _object_attach {
… …
998 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
999 } 1047 }
1000 1048
1001 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
1002 } else { 1050 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1052 }
1005 1053
1006 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
1007} 1055}
1008 1056
… …
1067 1115
1068 for (@$callbacks) { 1116 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1070 1118
1071 if ($@) { 1119 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1121 override;
1075 } 1122 }
1076 1123
1077 return 1 if $override; 1124 return 1 if $override;
1078 } 1125 }
… …
1157 for (@$attach) { 1204 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1160 } 1207 }
1161 } else { 1208 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1210 }
1164 } 1211 }
1165} 1212}
1166 1213
1167cf::attachable->attach ( 1214cf::attachable->attach (
… …
1194 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1195 1242
1196 sync_job { 1243 sync_job {
1197 if (length $$rdata) { 1244 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1247 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1248 if $VERBOSE_IO;
1202 1249
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1251 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
… …
1228 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1229 1276
1230 $filename =~ s%/[^/]+$%%; 1277 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1278 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1279 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1234 } 1281 }
1235 } else { 1282 } else {
1236 aio_unlink $filename; 1283 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1238 } 1285 }
… …
1262 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1310 $av = $st->{objs};
1264 } 1311 }
1265 1312
1266 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1315 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1316 if $VERBOSE_IO;
1270 1317
1271 ($data, $av) 1318 ($data, $av)
1272} 1319}
1273 1320
… …
1366 1413
1367 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1368 if $reply; 1415 if $reply;
1369 1416
1370 } else { 1417 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1419 }
1373 1420
1374 cf::override; 1421 cf::override;
1375 }, 1422 },
1376); 1423);
… …
1387 1434
1388 $grp 1435 $grp
1389} 1436}
1390 1437
1391sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1392 cf::sync_job { 1441 cf::sync_job {
1393 my %todo; 1442 my %todo;
1394 1443
1395 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1445 next unless -r $path;
… …
1414 1463
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1466
1418 $ext{source} = 1467 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1421 . $source 1470 . $source
1422 . "\n};\n1"; 1471 . "\n};\n1";
1423 1472
1424 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
… …
1436 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1486 next ext
1438 unless exists $done{$_}; 1487 unless exists $done{$_};
1439 } 1488 }
1440 1489
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1491
1443 my $active = eval $v->{source}; 1492 my $active = eval $v->{source};
1444 1493
1445 if (length $@) { 1494 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1495 error "$v->{path}: $@\n";
1447 1496
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1498 if exists $v->{meta}{mandatory};
1450 1499
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1453 } else { 1502 } else {
1454 $done{$k} = delete $todo{$k}; 1503 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1504 push @EXTS, $v->{pkg};
1456 $progress = 1; 1505 $progress = 1;
1457 1506
1458 warn "$v->{base}: extension inactive.\n" 1507 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1508 unless $active;
1460 } 1509 }
1461 } 1510 }
1462 1511
1463 unless ($progress) { 1512 unless ($progress) {
… …
1632 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1633 1682
1634 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1636 1685
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638 $pl->deactivate; 1687 $pl->deactivate;
1688
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640 $pl->ob->check_score;
1641 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1642 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1643 1694
1644 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1645 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1646 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
… …
1812sub generate_random_map { 1863sub generate_random_map {
1813 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1814 1865
1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1816 1867
1817 # mit "rum" bekleckern, nicht
1818 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1822 $rmp->{exit_on_final_map},
1823 $rmp->{xsize}, $rmp->{ysize},
1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1826 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1827 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1828 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1829 (cf::region::find $rmp->{region}), $rmp->{custom}
1830 )
1831} 1869}
1832 1870
1833=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1834 1872
1835Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
… …
1840 1878
1841sub register { 1879sub register {
1842 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1843 my $pkg = caller; 1881 my $pkg = caller;
1844 1882
1845 no strict;
1846 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1847 1884
1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1849} 1886}
1850 1887
… …
1862} 1899}
1863 1900
1864sub normalise { 1901sub normalise {
1865 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1866 1903
1867 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1868 1905
1869 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1870 1907
1871 # map plan: 1908 # map plan:
1872 # 1909 #
… …
1887 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1888 $path = "$base/$path"; 1925 $path = "$base/$path";
1889 } 1926 }
1890 1927
1891 for ($path) { 1928 for ($path) {
1892 redo if s{//}{/};
1893 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1894 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1895 } 1931 }
1896 1932
1897 $path 1933 $path
… …
1911 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1912 return $self; 1948 return $self;
1913 } 1949 }
1914 } 1950 }
1915 1951
1916 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1917 () 1953 ()
1918} 1954}
1919 1955
1920sub init { 1956sub init {
1921 my ($self) = @_; 1957 my ($self) = @_;
… …
2043} 2079}
2044 2080
2045sub find; 2081sub find;
2046sub find { 2082sub find {
2047 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2084
2085 cf::cede_to_tick;
2048 2086
2049 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
2050 2088
2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2052 my $guard2 = cf::lock_acquire "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2137 2175
2138 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2139 } 2177 }
2140 2178
2141 $self->post_load; 2179 $self->post_load;
2180
2181 1
2142} 2182}
2143 2183
2144# customize the map for a given player, i.e. 2184# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player 2185# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath 2186# maps to change the path to ~playername/mappath
… …
2184} 2224}
2185 2225
2186sub find_sync { 2226sub find_sync {
2187 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2188 2228
2189 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
2190} 2233}
2191 2234
2192sub do_load_sync { 2235sub do_load_sync {
2193 my ($map) = @_; 2236 my ($map) = @_;
2194 2237
2195 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2196 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2197 2240
2198 cf::sync_job { $map->load }; 2241 $map->load;
2199} 2242}
2200 2243
2201our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2202our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2203 2246
… …
2315 2358
2316 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317 2360
2318 return if $self->players; 2361 return if $self->players;
2319 2362
2320 warn "resetting map ", $self->path, "\n"; 2363 cf::trace "resetting map ", $self->path, "\n";
2321 2364
2322 $self->in_memory (cf::MAP_SWAPPED); 2365 $self->in_memory (cf::MAP_SWAPPED);
2323 2366
2324 # need to save uniques path 2367 # need to save uniques path
2325 unless ($self->{deny_save}) { 2368 unless ($self->{deny_save}) {
… …
2690 2733
2691sub cf::object::player::goto { 2734sub cf::object::player::goto {
2692 my ($self, $path, $x, $y, $check, $done) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2693 2736
2694 if ($self->{_link_recursion} >= $MAX_LINKS) { 2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION; 2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 } 2741 }
2699 2742
2700 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
… …
2848 $self->message ("Something went wrong deep within the deliantra server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2849 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2850 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2851 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2852 2895
2853 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2854 $self->leave_link; 2897 $self->leave_link;
2855 } 2898 }
2856 })->prio (1); 2899 })->prio (1);
2857} 2900}
2858 2901
… …
3171 3214
3172 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3173 if $reply; 3216 if $reply;
3174 3217
3175 } else { 3218 } else {
3176 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3177 } 3220 }
3178 3221
3179 cf::override; 3222 cf::override;
3180 }, 3223 },
3181); 3224);
… …
3262 decrease split destroy change_exp value msg lore send_msg)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3263 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3264 ["cf::player" => qw(peaceful send_msg)], 3307 ["cf::player" => qw(peaceful send_msg)],
3265 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3266) { 3309) {
3267 no strict 'refs';
3268 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3270 for @funs; 3312 for @funs;
3271} 3313}
3272 3314
… …
3311 local @cf::_safe_eval_args = values %vars; 3353 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval; 3354 @res = wantarray ? eval eval : scalar eval $eval;
3313 } 3355 }
3314 3356
3315 if ($@) { 3357 if ($@) {
3316 warn "$@"; 3358 warn "$@",
3317 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3318 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3319 } 3361 }
3320 3362
3321 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3322} 3364}
3323 3365
… …
3357 # for this (global event?) 3399 # for this (global event?)
3358 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3359 3401
3360 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3361 3403
3362 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3363 3405
3364 my $facedata;
3365 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3366 or die "$path: $!"; 3407 or die "$path: $!";
3367 3408
3368 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3369 3410
3370 $facedata->{version} == 2 3411 $facedata->{version} == 2
… …
3387 3428
3388 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3389 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3392 3434
3393 cf::cede_to_tick; 3435 cf::cede_to_tick;
3394 } 3436 }
3395 3437
3396 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
… …
3401 3443
3402 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3403 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3404 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3405 } else { 3447 } else {
3406 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3407 } 3449 }
3408 3450
3409 cf::cede_to_tick; 3451 cf::cede_to_tick;
3410 } 3452 }
3411 } 3453 }
… …
3429 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3430 3472
3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3432 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3433 } else { 3475 } else {
3434 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3435 } 3477 }
3436 3478
3437 cf::cede_to_tick; 3479 cf::cede_to_tick;
3438 } 3480 }
3439 } 3481 }
3440 3482
3441 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3442 3484
3443 1 3485 1
3444} 3486}
3445
3446cf::global->attach (on_resource_update => sub {
3447 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451 my $sound = $soundconf->{compat}[$_]
3452 or next;
3453
3454 my $face = cf::face::find "sound/$sound->[1]";
3455 cf::sound::set $sound->[0] => $face;
3456 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457 }
3458
3459 while (my ($k, $v) = each %{$soundconf->{event}}) {
3460 my $face = cf::face::find "sound/$v";
3461 cf::sound::set $k => $face;
3462 }
3463 }
3464});
3465 3487
3466register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3467 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3468 3490
3469 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
… …
3508sub reload_treasures { 3530sub reload_treasures {
3509 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3510 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3511} 3533}
3512 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
3513sub reload_resources { 3558sub reload_resources {
3514 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3515 3560
3561 reload_exp_table;
3562 reload_materials;
3516 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3517 reload_archetypes; 3565 reload_archetypes;
3518 reload_regions; 3566 reload_regions;
3519 reload_treasures; 3567 reload_treasures;
3520 3568
3521 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3522} 3570}
3523 3571
3524sub reload_config { 3572sub reload_config {
3525 warn "reloading config file...\n"; 3573 trace "reloading config file...\n";
3526 3574
3527 open my $fh, "<:utf8", "$CONFDIR/config" 3575 0 < aio_load "$CONFDIR/config", my $config
3528 or return; 3576 or die "$CONFDIR/config: $!";
3529 3577
3530 local $/; 3578 utf8::decode $config;
3531 *CFG = YAML::XS::Load scalar <$fh>; 3579 *CFG = yaml_load $config;
3532 3580
3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3534 3582
3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3588 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3541 and die "WARNING: m(un)lockall failed: $!\n"; 3589 and die "WARNING: m(un)lockall failed: $!\n";
3542 }; 3590 };
3543 warn $@ if $@; 3591 warn $@ if $@;
3544 } 3592 }
3545
3546 warn "finished reloading resource files\n";
3547} 3593}
3548 3594
3549sub pidfile() { 3595sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!"; 3597 or die "$PIDFILE: $!";
… …
3564 seek $fh, 0, 0; 3610 seek $fh, 0, 0;
3565 print $fh $$; 3611 print $fh $$;
3566} 3612}
3567 3613
3568sub main_loop { 3614sub main_loop {
3569 warn "EV::loop starting\n"; 3615 trace "EV::loop starting\n";
3570 if (1) { 3616 if (1) {
3571 EV::loop; 3617 EV::loop;
3572 } 3618 }
3573 warn "EV::loop returned\n"; 3619 trace "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP; 3620 goto &main_loop unless $REALLY_UNLOOP;
3575} 3621}
3576 3622
3577sub main { 3623sub main {
3578 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3579 3625
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584 3630
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586 3632
… …
3594 }; 3640 };
3595 3641
3596 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3597 3643
3598 cf::sync_job { 3644 cf::sync_job {
3599 cf::init_experience; 3645 cf::incloader::init ();
3646
3600 cf::init_anim; 3647 cf::init_anim;
3601 cf::init_attackmess; 3648 cf::init_attackmess;
3602 cf::init_dynamic; 3649 cf::init_dynamic;
3603 3650
3604 cf::load_settings; 3651 cf::load_settings;
3605 cf::load_materials;
3606 3652
3607 reload_resources; 3653 reload_resources;
3608 reload_config; 3654 reload_config;
3609 db_init; 3655 db_init;
3610 3656
… …
3622 3668
3623 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX (); 3670 use POSIX ();
3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626 3672
3627 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3628 }; 3674 };
3629 3675
3630 cf::object::thawer::errors_are_fatal 0; 3676 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n"; 3677 info "parse errors in files are no longer fatal from this point on.\n";
3632 3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3633 main_loop; 3684 goto &main_loop;
3634} 3685}
3635 3686
3636############################################################################# 3687#############################################################################
3637# initialisation and cleanup 3688# initialisation and cleanup
3638 3689
… …
3677 or return; 3728 or return;
3678 3729
3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3680 and return; 3731 and return;
3681 3732
3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3683 3734
3684 1 3735 1
3685} 3736}
3686 3737
3687our $uuid_lock; 3738our $uuid_lock;
… …
3699 or return; 3750 or return;
3700 3751
3701 my $value = uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3702 3753
3703 unless ($value) { 3754 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n"; 3755 info "cowardly refusing to write zero uuid value!\n";
3705 return; 3756 return;
3706 } 3757 }
3707 3758
3708 my $value = uuid_str $value + $uuid_skip; 3759 my $value = uuid_str $value + $uuid_skip;
3709 $uuid_skip = 0; 3760 $uuid_skip = 0;
… …
3719 or return; 3770 or return;
3720 3771
3721 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3722 and return; 3773 and return;
3723 3774
3724 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3725 3776
3726 1 3777 1
3727 3778
3728} 3779}
3729 3780
… …
3735} 3786}
3736 3787
3737sub emergency_save() { 3788sub emergency_save() {
3738 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3739 3790
3740 warn "emergency_perl_save: enter\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
3741 3797
3742 cf::sync_job { 3798 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so 3799 cf::write_runtime_sync; # external watchdog should not bark
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747 3800
3748 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3749 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3750 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3751 warn "emergency_perl_save: begin player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3752 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3753 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3754 $pl->valid or next; 3807 $pl->valid or next;
3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3756 $pl->save; 3809 $pl->save;
3757 } 3810 }
3758 warn "emergency_perl_save: end player save\n"; 3811 info "emergency_perl_save: end player save\n";
3759 3812
3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3760 warn "emergency_perl_save: begin map save\n"; 3815 info "emergency_perl_save: begin map save\n";
3761 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3762 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3763 $map->valid or next; 3818 $map->valid or next;
3764 $map->save; 3819 $map->save;
3765 } 3820 }
3766 warn "emergency_perl_save: end map save\n"; 3821 info "emergency_perl_save: end map save\n";
3767 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3768 warn "emergency_perl_save: begin database checkpoint\n"; 3825 info "emergency_perl_save: begin database checkpoint\n";
3769 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3770 warn "emergency_perl_save: end database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3771 3828
3772 warn "emergency_perl_save: begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3773 write_uuid_sync 1; 3830 write_uuid_sync 1;
3774 warn "emergency_perl_save: end write uuid\n"; 3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
3775 }; 3851 };
3776 3852
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3782 warn "emergency_perl_save: leave\n"; 3853 info "emergency_perl_save: leave\n";
3783} 3854}
3784 3855
3785sub post_cleanup { 3856sub post_cleanup {
3786 my ($make_core) = @_; 3857 my ($make_core) = @_;
3787 3858
3859 IO::AIO::flush;
3860
3788 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3789 if $make_core; 3862 if $make_core;
3790 3863
3791 my $fh = pidfile; 3864 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$; 3865 unlink $PIDFILE if <$fh> == $$;
3793} 3866}
… …
3817 } 3890 }
3818} 3891}
3819 3892
3820sub do_reload_perl() { 3893sub do_reload_perl() {
3821 # can/must only be called in main 3894 # can/must only be called in main
3822 if (in_main) { 3895 unless (in_main) {
3823 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3824 return; 3897 return;
3825 } 3898 }
3826 3899
3827 return if $RELOAD++; 3900 return if $RELOAD++;
3828 3901
3829 my $t1 = AE::time; 3902 my $t1 = AE::time;
3830 3903
3831 while ($RELOAD) { 3904 while ($RELOAD) {
3832 warn "reloading..."; 3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3833 3907
3834 warn "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3835 3909
3836 cf::sync_job { 3910 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838 cf::emergency_save; 3911 #cf::emergency_save;
3839 cf::write_runtime_sync; # external watchdog should not bark
3840 3912
3841 warn "syncing database to disk";
3842 BDB::db_env_txn_checkpoint $DB_ENV;
3843
3844 # if anything goes wrong in here, we should simply crash as we already saved
3845
3846 warn "flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3852 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3853 %EXT_CORO = (); 3915 %EXT_CORO = ();
3854 3916
3855 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3856 %COMMAND = (); 3918 %COMMAND = ();
3857 3919
3858 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3859 %EXTCMD = (); 3921 %EXTCMD = ();
3860 %EXTICMD = (); 3922 %EXTICMD = ();
3861 3923
3862 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3863 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3864 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3865 3927
3866 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3867 eval { 3929 eval {
3868 $cb->($pkg); 3930 $cb->($pkg);
3869 1 3931 1
3870 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3871 } 3933 }
3872 3934
3873 warn "... clearing $pkg"; 3935 trace "... clearing $pkg";
3874 clear_package $pkg; 3936 clear_package $pkg;
3875 } 3937 }
3876 3938
3877 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3878 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3879 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880 3942
3881 warn "... unloading $k"; 3943 trace "... unloading $k";
3882 delete $INC{$k}; 3944 delete $INC{$k};
3883 3945
3884 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3885 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3886 3948
… …
3889 } 3951 }
3890 3952
3891 clear_package $k; 3953 clear_package $k;
3892 } 3954 }
3893 3955
3894 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3895 clear_package "safe::$_" 3957 clear_package "safe::$_"
3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3897 3959
3898 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3899 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3901 3963
3902 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3903 # and global variables created in xs 3965 # and global variables created in xs
3904 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3905 3967
3906 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3907 3969
3908 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3909 require cf; 3971 require cf;
3910 cf::_connect_to_perl_1; 3972 cf::_connect_to_perl_1;
3911 3973
3912 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3913 cf::reload_config; 3975 cf::reload_config;
3914 3976
3915 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3916 cf::load_extensions; 3978 cf::load_extensions;
3917 3979
3918 if ($REATTACH_ON_RELOAD) { 3980 if ($REATTACH_ON_RELOAD) {
3919 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3920 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3921 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3922 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3923 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3924 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3925 } 3987 }
3926 3988
3927 warn "running post_init jobs"; 3989 cf::_post_init 1;
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3929 3990
3930 warn "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3931 3992
3932 1 3993 1
3933 } or do { 3994 } or do {
3934 warn $@; 3995 error $@;
3935 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3936 }; 3997 };
3937 3998
3938 warn "reloaded";
3939 --$RELOAD; 3999 --$RELOAD;
3940 } 4000 }
3941 4001
3942 $t1 = AE::time - $t1; 4002 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n"; 4003 info "perl_reload: completed in ${t1}s\n";
3944}; 4004};
3945 4005
3946our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3947 4007
3948sub reload_perl() { 4008sub reload_perl() {
… …
3969 reload_perl; 4029 reload_perl;
3970 }; 4030 };
3971 } 4031 }
3972}; 4032};
3973 4033
3974unshift @INC, $LIBDIR; 4034#############################################################################
3975 4035
3976my $bug_warning = 0; 4036my $bug_warning = 0;
3977 4037
3978our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3979our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3980 4040
3981sub wait_for_tick { 4041sub wait_for_tick() {
3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3983 4043
3984 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3985 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3986 $signal->wait; 4046 $signal->wait;
3987} 4047}
3988 4048
3989sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3991 4051
3992 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3993 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3994 $signal->wait; 4054 $signal->wait;
… …
4008 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4010 Coro::async_pool { 4070 Coro::async_pool {
4011 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
4012 write_runtime_sync 4072 write_runtime_sync
4013 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
4014 }; 4074 };
4015 } 4075 }
4016 4076
4017 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4018 $sig->send; 4078 $sig->send;
… …
4026 4086
4027 if (0) { 4087 if (0) {
4028 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
4029 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
4030 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
4032 } 4092 }
4033 } 4093 }
4034} 4094}
4035 4095
4036{ 4096{
… …
4081 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
4082 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
4083 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
4084} 4144}
4085 4145
4086my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
4087 4148
4088sub _log_backtrace { 4149sub _log_backtrace {
4089 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
4090 4151
4091 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
4092 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4093 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
4094 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
4095 ++$_log_backtrace; 4160 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
4097 async { 4162 async {
4098 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
4099 4164
… …
4119 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
4120 --$_log_backtrace; 4185 --$_log_backtrace;
4121 }; 4186 };
4122 } else { 4187 } else {
4123 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
4124 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4125 } 4190 }
4126} 4191}
4127 4192
4128# load additional modules 4193# load additional modules
4129require "cf/$_.pm" for @EXTRA_MODULES; 4194require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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