… | |
… | |
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 | |
23 | package cf; |
23 | package cf; |
24 | |
24 | |
25 | use 5.10.0; |
25 | use common::sense; |
26 | use utf8; |
|
|
27 | use strict qw(vars subs); |
|
|
28 | |
26 | |
29 | use Symbol; |
27 | use Symbol; |
30 | use List::Util; |
28 | use List::Util; |
31 | use Socket; |
29 | use Socket; |
32 | use EV; |
30 | use 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 | |
81 | sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload |
79 | sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload |
82 | |
80 | |
|
|
81 | our @ORIG_INC; |
|
|
82 | |
83 | our %COMMAND = (); |
83 | our %COMMAND = (); |
84 | our %COMMAND_TIME = (); |
84 | our %COMMAND_TIME = (); |
85 | |
85 | |
86 | our @EXTS = (); # list of extension package names |
86 | our @EXTS = (); # list of extension package names |
87 | our %EXTCMD = (); |
87 | our %EXTCMD = (); |
… | |
… | |
106 | our $RANDOMDIR = "$LOCALDIR/random"; |
106 | our $RANDOMDIR = "$LOCALDIR/random"; |
107 | our $BDBDIR = "$LOCALDIR/db"; |
107 | our $BDBDIR = "$LOCALDIR/db"; |
108 | our $PIDFILE = "$LOCALDIR/pid"; |
108 | our $PIDFILE = "$LOCALDIR/pid"; |
109 | our $RUNTIMEFILE = "$LOCALDIR/runtime"; |
109 | our $RUNTIMEFILE = "$LOCALDIR/runtime"; |
110 | |
110 | |
111 | our %RESOURCE; |
111 | our %RESOURCE; # unused |
112 | |
112 | |
113 | our $OUTPUT_RATE_MIN = 4000; |
113 | our $OUTPUT_RATE_MIN = 3000; |
114 | our $OUTPUT_RATE_MAX = 100000; |
114 | our $OUTPUT_RATE_MAX = 1000000; |
|
|
115 | |
|
|
116 | our $MAX_LINKS = 32; # how many chained exits to follow |
|
|
117 | our $VERBOSE_IO = 1; |
115 | |
118 | |
116 | our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) |
119 | our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) |
117 | our $NEXT_RUNTIME_WRITE; # when should the runtime file be written |
120 | our $NEXT_RUNTIME_WRITE; # when should the runtime file be written |
118 | our $NEXT_TICK; |
121 | our $NEXT_TICK; |
119 | our $USE_FSYNC = 1; # use fsync to write maps - default on |
122 | our $USE_FSYNC = 1; # use fsync to write maps - default on |
… | |
… | |
121 | our $BDB_DEADLOCK_WATCHER; |
124 | our $BDB_DEADLOCK_WATCHER; |
122 | our $BDB_CHECKPOINT_WATCHER; |
125 | our $BDB_CHECKPOINT_WATCHER; |
123 | our $BDB_TRICKLE_WATCHER; |
126 | our $BDB_TRICKLE_WATCHER; |
124 | our $DB_ENV; |
127 | our $DB_ENV; |
125 | |
128 | |
126 | our @EXTRA_MODULES = qw(pod match mapscript); |
129 | our @EXTRA_MODULES = qw(pod match mapscript incloader); |
127 | |
130 | |
128 | our %CFG; |
131 | our %CFG; |
129 | |
132 | |
130 | our $UPTIME; $UPTIME ||= time; |
133 | our $UPTIME; $UPTIME ||= time; |
131 | our $RUNTIME; |
134 | our $RUNTIME; |
… | |
… | |
230 | from wherever your confdir points to. |
233 | from wherever your confdir points to. |
231 | |
234 | |
232 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
235 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
233 | |
236 | |
234 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
237 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
235 | returns directly I<after> the tick processing (and consequently, can only wake one process |
238 | returns directly I<after> the tick processing (and consequently, can only wake one thread |
236 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
239 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
|
|
240 | |
|
|
241 | =cut |
|
|
242 | |
|
|
243 | sub wait_for_tick(); |
|
|
244 | sub wait_for_tick_begin(); |
237 | |
245 | |
238 | =item @cf::INVOKE_RESULTS |
246 | =item @cf::INVOKE_RESULTS |
239 | |
247 | |
240 | This array contains the results of the last C<invoke ()> call. When |
248 | This array contains the results of the last C<invoke ()> call. When |
241 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
249 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
… | |
… | |
249 | |
257 | |
250 | =back |
258 | =back |
251 | |
259 | |
252 | =cut |
260 | =cut |
253 | |
261 | |
|
|
262 | sub error(@) { LOG llevError, join "", @_ } |
|
|
263 | sub warn (@) { LOG llevWarn , join "", @_ } |
|
|
264 | sub info (@) { LOG llevInfo , join "", @_ } |
|
|
265 | sub debug(@) { LOG llevDebug, join "", @_ } |
|
|
266 | sub trace(@) { LOG llevTrace, join "", @_ } |
|
|
267 | |
254 | $Coro::State::WARNHOOK = sub { |
268 | $Coro::State::WARNHOOK = sub { |
255 | my $msg = join "", @_; |
269 | my $msg = join "", @_; |
256 | |
270 | |
257 | $msg .= "\n" |
271 | $msg .= "\n" |
258 | unless $msg =~ /\n$/; |
272 | unless $msg =~ /\n$/; |
259 | |
273 | |
260 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
274 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
261 | |
275 | |
262 | LOG llevError, $msg; |
276 | LOG llevWarn, $msg; |
263 | }; |
277 | }; |
264 | |
278 | |
265 | $Coro::State::DIEHOOK = sub { |
279 | $Coro::State::DIEHOOK = sub { |
266 | return unless $^S eq 0; # "eq", not "==" |
280 | return unless $^S eq 0; # "eq", not "==" |
267 | |
281 | |
268 | warn Carp::longmess $_[0]; |
282 | error Carp::longmess $_[0]; |
269 | |
283 | |
270 | if (in_main) {#d# |
284 | if (in_main) {#d# |
271 | warn "DIEHOOK called in main context, Coro bug?\n";#d# |
285 | error "DIEHOOK called in main context, Coro bug?\n";#d# |
272 | return;#d# |
286 | return;#d# |
273 | }#d# |
287 | }#d# |
274 | |
288 | |
275 | # kill coroutine otherwise |
289 | # kill coroutine otherwise |
276 | Coro::terminate |
290 | Coro::terminate |
… | |
… | |
509 | =cut |
523 | =cut |
510 | |
524 | |
511 | sub sync_job(&) { |
525 | sub sync_job(&) { |
512 | my ($job) = @_; |
526 | my ($job) = @_; |
513 | |
527 | |
514 | if ($Coro::current == $Coro::main) { |
528 | if (in_main) { |
515 | my $time = AE::time; |
529 | my $time = AE::time; |
516 | |
530 | |
517 | # this is the main coro, too bad, we have to block |
531 | # this is the main coro, too bad, we have to block |
518 | # till the operation succeeds, freezing the server :/ |
532 | # till the operation succeeds, freezing the server :/ |
519 | |
533 | |
520 | LOG llevError, Carp::longmess "sync job";#d# |
534 | #LOG llevError, Carp::longmess "sync job";#d# |
521 | |
535 | |
522 | my $freeze_guard = freeze_mainloop; |
536 | my $freeze_guard = freeze_mainloop; |
523 | |
537 | |
524 | my $busy = 1; |
538 | my $busy = 1; |
525 | my @res; |
539 | my @res; |
526 | |
540 | |
527 | (async { |
541 | (async { |
528 | $Coro::current->desc ("sync job coro"); |
542 | $Coro::current->desc ("sync job coro"); |
529 | @res = eval { $job->() }; |
543 | @res = eval { $job->() }; |
530 | warn $@ if $@; |
544 | error $@ if $@; |
531 | undef $busy; |
545 | undef $busy; |
532 | })->prio (Coro::PRIO_MAX); |
546 | })->prio (Coro::PRIO_MAX); |
533 | |
547 | |
534 | while ($busy) { |
548 | while ($busy) { |
535 | if (Coro::nready) { |
549 | if (Coro::nready) { |
… | |
… | |
578 | Coro::Storable. May, of course, block. Note that the executed sub may |
592 | Coro::Storable. May, of course, block. Note that the executed sub may |
579 | never block itself or use any form of event handling. |
593 | never block itself or use any form of event handling. |
580 | |
594 | |
581 | =cut |
595 | =cut |
582 | |
596 | |
|
|
597 | sub post_fork { |
|
|
598 | reset_signals; |
|
|
599 | } |
|
|
600 | |
583 | sub fork_call(&@) { |
601 | sub fork_call(&@) { |
584 | my ($cb, @args) = @_; |
602 | my ($cb, @args) = @_; |
585 | |
603 | |
586 | # we seemingly have to make a local copy of the whole thing, |
604 | # we seemingly have to make a local copy of the whole thing, |
587 | # otherwise perl prematurely frees the stuff :/ |
605 | # otherwise perl prematurely frees the stuff :/ |
588 | # TODO: investigate and fix (likely this will be rather laborious) |
606 | # TODO: investigate and fix (likely this will be rather laborious) |
589 | |
607 | |
590 | my @res = Coro::Util::fork_eval { |
608 | my @res = Coro::Util::fork_eval { |
591 | reset_signals; |
609 | cf::post_fork; |
592 | &$cb |
610 | &$cb |
593 | }, @args; |
611 | }, @args; |
594 | |
612 | |
595 | wantarray ? @res : $res[-1] |
613 | wantarray ? @res : $res[-1] |
596 | } |
614 | } |
… | |
… | |
648 | within each server. |
666 | within each server. |
649 | |
667 | |
650 | =cut |
668 | =cut |
651 | |
669 | |
652 | sub db_table($) { |
670 | sub db_table($) { |
|
|
671 | cf::error "db_get called from main context" |
|
|
672 | if $Coro::current == $Coro::main; |
|
|
673 | |
653 | my ($name) = @_; |
674 | my ($name) = @_; |
654 | my $db = BDB::db_create $DB_ENV; |
675 | my $db = BDB::db_create $DB_ENV; |
655 | |
676 | |
656 | eval { |
677 | eval { |
657 | $db->set_flags (BDB::CHKSUM); |
678 | $db->set_flags (BDB::CHKSUM); |
… | |
… | |
667 | } |
688 | } |
668 | |
689 | |
669 | our $DB; |
690 | our $DB; |
670 | |
691 | |
671 | sub db_init { |
692 | sub db_init { |
672 | cf::sync_job { |
|
|
673 | $DB ||= db_table "db"; |
693 | $DB ||= db_table "db"; |
674 | }; |
|
|
675 | } |
694 | } |
676 | |
695 | |
677 | sub db_get($$) { |
696 | sub db_get($$) { |
678 | my $key = "$_[0]/$_[1]"; |
697 | my $key = "$_[0]/$_[1]"; |
679 | |
698 | |
680 | cf::sync_job { |
699 | cf::error "db_get called from main context" |
|
|
700 | if $Coro::current == $Coro::main; |
|
|
701 | |
681 | BDB::db_get $DB, undef, $key, my $data; |
702 | BDB::db_get $DB, undef, $key, my $data; |
682 | |
703 | |
683 | $! ? () |
704 | $! ? () |
684 | : $data |
705 | : $data |
685 | } |
|
|
686 | } |
706 | } |
687 | |
707 | |
688 | sub db_put($$$) { |
708 | sub db_put($$$) { |
689 | BDB::dbreq_pri 4; |
709 | BDB::dbreq_pri 4; |
690 | BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; |
710 | BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; |
… | |
… | |
746 | |
766 | |
747 | my $t1 = Time::HiRes::time; |
767 | my $t1 = Time::HiRes::time; |
748 | my $data = $process->(\@data); |
768 | my $data = $process->(\@data); |
749 | my $t2 = Time::HiRes::time; |
769 | my $t2 = Time::HiRes::time; |
750 | |
770 | |
751 | warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
771 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
752 | |
772 | |
753 | db_put cache => "$id/data", $data; |
773 | db_put cache => "$id/data", $data; |
754 | db_put cache => "$id/md5" , $md5; |
774 | db_put cache => "$id/md5" , $md5; |
755 | db_put cache => "$id/meta", $meta; |
775 | db_put cache => "$id/meta", $meta; |
756 | |
776 | |
… | |
… | |
766 | |
786 | |
767 | =cut |
787 | =cut |
768 | |
788 | |
769 | sub datalog($@) { |
789 | sub datalog($@) { |
770 | my ($type, %kv) = @_; |
790 | my ($type, %kv) = @_; |
771 | warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); |
791 | info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); |
772 | } |
792 | } |
773 | |
793 | |
774 | =back |
794 | =back |
775 | |
795 | |
776 | =cut |
796 | =cut |
… | |
… | |
971 | |
991 | |
972 | } elsif (exists $cb_id{$type}) { |
992 | } elsif (exists $cb_id{$type}) { |
973 | _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; |
993 | _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; |
974 | |
994 | |
975 | } elsif (ref $type) { |
995 | } elsif (ref $type) { |
976 | warn "attaching objects not supported, ignoring.\n"; |
996 | error "attaching objects not supported, ignoring.\n"; |
977 | |
997 | |
978 | } else { |
998 | } else { |
979 | shift @arg; |
999 | shift @arg; |
980 | warn "attach argument '$type' not supported, ignoring.\n"; |
1000 | error "attach argument '$type' not supported, ignoring.\n"; |
981 | } |
1001 | } |
982 | } |
1002 | } |
983 | } |
1003 | } |
984 | |
1004 | |
985 | sub _object_attach { |
1005 | sub _object_attach { |
… | |
… | |
995 | _attach $registry, $klass, @attach; |
1015 | _attach $registry, $klass, @attach; |
996 | } |
1016 | } |
997 | |
1017 | |
998 | $obj->{$name} = \%arg; |
1018 | $obj->{$name} = \%arg; |
999 | } else { |
1019 | } else { |
1000 | warn "object uses attachment '$name' which is not available, postponing.\n"; |
1020 | info "object uses attachment '$name' which is not available, postponing.\n"; |
1001 | } |
1021 | } |
1002 | |
1022 | |
1003 | $obj->{_attachment}{$name} = undef; |
1023 | $obj->{_attachment}{$name} = undef; |
1004 | } |
1024 | } |
1005 | |
1025 | |
… | |
… | |
1064 | |
1084 | |
1065 | for (@$callbacks) { |
1085 | for (@$callbacks) { |
1066 | eval { &{$_->[1]} }; |
1086 | eval { &{$_->[1]} }; |
1067 | |
1087 | |
1068 | if ($@) { |
1088 | if ($@) { |
1069 | warn "$@"; |
|
|
1070 | warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; |
1089 | error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; |
1071 | override; |
1090 | override; |
1072 | } |
1091 | } |
1073 | |
1092 | |
1074 | return 1 if $override; |
1093 | return 1 if $override; |
1075 | } |
1094 | } |
… | |
… | |
1154 | for (@$attach) { |
1173 | for (@$attach) { |
1155 | my ($klass, @attach) = @$_; |
1174 | my ($klass, @attach) = @$_; |
1156 | _attach $registry, $klass, @attach; |
1175 | _attach $registry, $klass, @attach; |
1157 | } |
1176 | } |
1158 | } else { |
1177 | } else { |
1159 | warn "object uses attachment '$name' that is not available, postponing.\n"; |
1178 | info "object uses attachment '$name' that is not available, postponing.\n"; |
1160 | } |
1179 | } |
1161 | } |
1180 | } |
1162 | } |
1181 | } |
1163 | |
1182 | |
1164 | cf::attachable->attach ( |
1183 | cf::attachable->attach ( |
… | |
… | |
1191 | my ($filename, $rdata, $objs) = @_; |
1210 | my ($filename, $rdata, $objs) = @_; |
1192 | |
1211 | |
1193 | sync_job { |
1212 | sync_job { |
1194 | if (length $$rdata) { |
1213 | if (length $$rdata) { |
1195 | utf8::decode (my $decname = $filename); |
1214 | utf8::decode (my $decname = $filename); |
1196 | warn sprintf "saving %s (%d,%d)\n", |
1215 | trace sprintf "saving %s (%d,%d)\n", |
1197 | $decname, length $$rdata, scalar @$objs; |
1216 | $decname, length $$rdata, scalar @$objs |
|
|
1217 | if $VERBOSE_IO; |
1198 | |
1218 | |
1199 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1219 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1200 | aio_chmod $fh, SAVE_MODE; |
1220 | aio_chmod $fh, SAVE_MODE; |
1201 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1221 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1202 | if ($cf::USE_FSYNC) { |
1222 | if ($cf::USE_FSYNC) { |
… | |
… | |
1224 | aio_rename "$filename~", $filename; |
1244 | aio_rename "$filename~", $filename; |
1225 | |
1245 | |
1226 | $filename =~ s%/[^/]+$%%; |
1246 | $filename =~ s%/[^/]+$%%; |
1227 | aio_pathsync $filename if $cf::USE_FSYNC; |
1247 | aio_pathsync $filename if $cf::USE_FSYNC; |
1228 | } else { |
1248 | } else { |
1229 | warn "unable to save objects: $filename~: $!\n"; |
1249 | error "unable to save objects: $filename~: $!\n"; |
1230 | } |
1250 | } |
1231 | } else { |
1251 | } else { |
1232 | aio_unlink $filename; |
1252 | aio_unlink $filename; |
1233 | aio_unlink "$filename.pst"; |
1253 | aio_unlink "$filename.pst"; |
1234 | } |
1254 | } |
… | |
… | |
1258 | my $st = eval { Coro::Storable::thaw $av }; |
1278 | my $st = eval { Coro::Storable::thaw $av }; |
1259 | $av = $st->{objs}; |
1279 | $av = $st->{objs}; |
1260 | } |
1280 | } |
1261 | |
1281 | |
1262 | utf8::decode (my $decname = $filename); |
1282 | utf8::decode (my $decname = $filename); |
1263 | warn sprintf "loading %s (%d,%d)\n", |
1283 | trace sprintf "loading %s (%d,%d)\n", |
1264 | $decname, length $data, scalar @{$av || []}; |
1284 | $decname, length $data, scalar @{$av || []} |
|
|
1285 | if $VERBOSE_IO; |
1265 | |
1286 | |
1266 | ($data, $av) |
1287 | ($data, $av) |
1267 | } |
1288 | } |
1268 | |
1289 | |
1269 | =head2 COMMAND CALLBACKS |
1290 | =head2 COMMAND CALLBACKS |
… | |
… | |
1361 | |
1382 | |
1362 | $pl->ext_reply ($reply, @reply) |
1383 | $pl->ext_reply ($reply, @reply) |
1363 | if $reply; |
1384 | if $reply; |
1364 | |
1385 | |
1365 | } else { |
1386 | } else { |
1366 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1387 | error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1367 | } |
1388 | } |
1368 | |
1389 | |
1369 | cf::override; |
1390 | cf::override; |
1370 | }, |
1391 | }, |
1371 | ); |
1392 | ); |
… | |
… | |
1382 | |
1403 | |
1383 | $grp |
1404 | $grp |
1384 | } |
1405 | } |
1385 | |
1406 | |
1386 | sub load_extensions { |
1407 | sub load_extensions { |
|
|
1408 | info "loading extensions..."; |
|
|
1409 | |
1387 | cf::sync_job { |
1410 | cf::sync_job { |
1388 | my %todo; |
1411 | my %todo; |
1389 | |
1412 | |
1390 | for my $path (<$LIBDIR/*.ext>) { |
1413 | for my $path (<$LIBDIR/*.ext>) { |
1391 | next unless -r $path; |
1414 | next unless -r $path; |
… | |
… | |
1409 | |
1432 | |
1410 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1433 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1411 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1434 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1412 | |
1435 | |
1413 | $ext{source} = |
1436 | $ext{source} = |
1414 | "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" |
1437 | "package $pkg; use common::sense;\n" |
1415 | . "#line 1 \"$path\"\n{\n" |
1438 | . "#line 1 \"$path\"\n{\n" |
1416 | . $source |
1439 | . $source |
1417 | . "\n};\n1"; |
1440 | . "\n};\n1"; |
1418 | |
1441 | |
1419 | $todo{$base} = \%ext; |
1442 | $todo{$base} = \%ext; |
… | |
… | |
1431 | for (split /,\s*/, $v->{meta}{depends}) { |
1454 | for (split /,\s*/, $v->{meta}{depends}) { |
1432 | next ext |
1455 | next ext |
1433 | unless exists $done{$_}; |
1456 | unless exists $done{$_}; |
1434 | } |
1457 | } |
1435 | |
1458 | |
1436 | warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; |
1459 | trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; |
1437 | |
1460 | |
1438 | my $active = eval $v->{source}; |
1461 | my $active = eval $v->{source}; |
1439 | |
1462 | |
1440 | if (length $@) { |
1463 | if (length $@) { |
1441 | warn "$v->{path}: $@\n"; |
1464 | error "$v->{path}: $@\n"; |
1442 | |
1465 | |
1443 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1466 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1444 | if exists $v->{meta}{mandatory}; |
1467 | if exists $v->{meta}{mandatory}; |
1445 | |
1468 | |
1446 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
1469 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
… | |
… | |
1448 | } else { |
1471 | } else { |
1449 | $done{$k} = delete $todo{$k}; |
1472 | $done{$k} = delete $todo{$k}; |
1450 | push @EXTS, $v->{pkg}; |
1473 | push @EXTS, $v->{pkg}; |
1451 | $progress = 1; |
1474 | $progress = 1; |
1452 | |
1475 | |
1453 | warn "$v->{base}: extension inactive.\n" |
1476 | info "$v->{base}: extension inactive.\n" |
1454 | unless $active; |
1477 | unless $active; |
1455 | } |
1478 | } |
1456 | } |
1479 | } |
1457 | |
1480 | |
1458 | unless ($progress) { |
1481 | unless ($progress) { |
… | |
… | |
1629 | $pl->{deny_save} = 1; |
1652 | $pl->{deny_save} = 1; |
1630 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1653 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1631 | |
1654 | |
1632 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1655 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1633 | $pl->deactivate; |
1656 | $pl->deactivate; |
|
|
1657 | |
1634 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1658 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1635 | $pl->ob->check_score; |
1659 | ext::highscore::check ($pl->ob); |
|
|
1660 | |
1636 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1661 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1637 | $pl->ns->destroy if $pl->ns; |
1662 | $pl->ns->destroy if $pl->ns; |
1638 | |
1663 | |
1639 | my $path = playerdir $pl; |
1664 | my $path = playerdir $pl; |
1640 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1665 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
… | |
… | |
1835 | |
1860 | |
1836 | sub register { |
1861 | sub register { |
1837 | my (undef, $regex, $prio) = @_; |
1862 | my (undef, $regex, $prio) = @_; |
1838 | my $pkg = caller; |
1863 | my $pkg = caller; |
1839 | |
1864 | |
1840 | no strict; |
|
|
1841 | push @{"$pkg\::ISA"}, __PACKAGE__; |
1865 | push @{"$pkg\::ISA"}, __PACKAGE__; |
1842 | |
1866 | |
1843 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
1867 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
1844 | } |
1868 | } |
1845 | |
1869 | |
… | |
… | |
1857 | } |
1881 | } |
1858 | |
1882 | |
1859 | sub normalise { |
1883 | sub normalise { |
1860 | my ($path, $base) = @_; |
1884 | my ($path, $base) = @_; |
1861 | |
1885 | |
1862 | $path = "$path"; # make sure its a string |
1886 | $path = "$path"; # make sure it's a string |
1863 | |
1887 | |
1864 | $path =~ s/\.map$//; |
1888 | $path =~ s/\.map$//; |
1865 | |
1889 | |
1866 | # map plan: |
1890 | # map plan: |
1867 | # |
1891 | # |
… | |
… | |
1906 | $self->init; # pass $1 etc. |
1930 | $self->init; # pass $1 etc. |
1907 | return $self; |
1931 | return $self; |
1908 | } |
1932 | } |
1909 | } |
1933 | } |
1910 | |
1934 | |
1911 | Carp::cluck "unable to resolve path '$path' (base '$base')."; |
1935 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
1912 | () |
1936 | () |
1913 | } |
1937 | } |
1914 | |
1938 | |
1915 | sub init { |
1939 | sub init { |
1916 | my ($self) = @_; |
1940 | my ($self) = @_; |
… | |
… | |
2038 | } |
2062 | } |
2039 | |
2063 | |
2040 | sub find; |
2064 | sub find; |
2041 | sub find { |
2065 | sub find { |
2042 | my ($path, $origin) = @_; |
2066 | my ($path, $origin) = @_; |
|
|
2067 | |
|
|
2068 | cf::cede_to_tick; |
2043 | |
2069 | |
2044 | $path = normalise $path, $origin && $origin->path; |
2070 | $path = normalise $path, $origin && $origin->path; |
2045 | |
2071 | |
2046 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2072 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2047 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2073 | my $guard2 = cf::lock_acquire "map_find:$path"; |
… | |
… | |
2162 | or next; |
2188 | or next; |
2163 | $neigh = find $neigh, $map |
2189 | $neigh = find $neigh, $map |
2164 | or next; |
2190 | or next; |
2165 | $neigh->load; |
2191 | $neigh->load; |
2166 | |
2192 | |
|
|
2193 | # now find the diagonal neighbours |
2167 | push @neigh, |
2194 | push @neigh, |
2168 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
2195 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
2169 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
2196 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
2170 | } |
2197 | } |
2171 | |
2198 | |
… | |
… | |
2178 | } |
2205 | } |
2179 | |
2206 | |
2180 | sub find_sync { |
2207 | sub find_sync { |
2181 | my ($path, $origin) = @_; |
2208 | my ($path, $origin) = @_; |
2182 | |
2209 | |
2183 | cf::sync_job { find $path, $origin } |
2210 | return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" |
|
|
2211 | if $Coro::current == $Coro::main; |
|
|
2212 | |
|
|
2213 | find $path, $origin |
2184 | } |
2214 | } |
2185 | |
2215 | |
2186 | sub do_load_sync { |
2216 | sub do_load_sync { |
2187 | my ($map) = @_; |
2217 | my ($map) = @_; |
2188 | |
2218 | |
2189 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
2219 | return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" |
2190 | if $Coro::current == $Coro::main; |
2220 | if $Coro::current == $Coro::main; |
2191 | |
2221 | |
2192 | cf::sync_job { $map->load }; |
2222 | $map->load; |
2193 | } |
2223 | } |
2194 | |
2224 | |
2195 | our %MAP_PREFETCH; |
2225 | our %MAP_PREFETCH; |
2196 | our $MAP_PREFETCHER = undef; |
2226 | our $MAP_PREFETCHER = undef; |
2197 | |
2227 | |
… | |
… | |
2309 | |
2339 | |
2310 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2340 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2311 | |
2341 | |
2312 | return if $self->players; |
2342 | return if $self->players; |
2313 | |
2343 | |
2314 | warn "resetting map ", $self->path, "\n"; |
2344 | cf::trace "resetting map ", $self->path, "\n"; |
2315 | |
2345 | |
2316 | $self->in_memory (cf::MAP_SWAPPED); |
2346 | $self->in_memory (cf::MAP_SWAPPED); |
2317 | |
2347 | |
2318 | # need to save uniques path |
2348 | # need to save uniques path |
2319 | unless ($self->{deny_save}) { |
2349 | unless ($self->{deny_save}) { |
… | |
… | |
2583 | |
2613 | |
2584 | Freezes the player and moves him/her to a special map (C<{link}>). |
2614 | Freezes the player and moves him/her to a special map (C<{link}>). |
2585 | |
2615 | |
2586 | The player should be reasonably safe there for short amounts of time (e.g. |
2616 | The player should be reasonably safe there for short amounts of time (e.g. |
2587 | for loading a map). You I<MUST> call C<leave_link> as soon as possible, |
2617 | for loading a map). You I<MUST> call C<leave_link> as soon as possible, |
2588 | though, as the palyer cannot control the character while it is on the link |
2618 | though, as the player cannot control the character while it is on the link |
2589 | map. |
2619 | map. |
2590 | |
2620 | |
2591 | Will never block. |
2621 | Will never block. |
2592 | |
2622 | |
2593 | =item $player_object->leave_link ($map, $x, $y) |
2623 | =item $player_object->leave_link ($map, $x, $y) |
… | |
… | |
2614 | sub cf::object::player::enter_link { |
2644 | sub cf::object::player::enter_link { |
2615 | my ($self) = @_; |
2645 | my ($self) = @_; |
2616 | |
2646 | |
2617 | $self->deactivate_recursive; |
2647 | $self->deactivate_recursive; |
2618 | |
2648 | |
|
|
2649 | ++$self->{_link_recursion}; |
|
|
2650 | |
2619 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
2651 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
2620 | |
2652 | |
2621 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
2653 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
2622 | if $self->map && $self->map->{path} ne "{link}"; |
2654 | if $self->map && $self->map->{path} ne "{link}"; |
2623 | |
2655 | |
… | |
… | |
2654 | $map->load_neighbours; |
2686 | $map->load_neighbours; |
2655 | |
2687 | |
2656 | return unless $self->contr->active; |
2688 | return unless $self->contr->active; |
2657 | |
2689 | |
2658 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2690 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2659 | $self->enter_map ($map, $x, $y); |
2691 | if ($self->enter_map ($map, $x, $y)) { |
2660 | |
2692 | # entering was successful |
|
|
2693 | delete $self->{_link_recursion}; |
2661 | # only activate afterwards, to support waiting in hooks |
2694 | # only activate afterwards, to support waiting in hooks |
2662 | $self->activate_recursive; |
2695 | $self->activate_recursive; |
2663 | # unless exists $self->{_link_pos}; # maybe we re in-flight again |
2696 | } |
2664 | } |
|
|
2665 | |
2697 | |
|
|
2698 | } |
|
|
2699 | |
2666 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
2700 | =item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]]) |
2667 | |
2701 | |
2668 | Moves the player to the given map-path and coordinates by first freezing |
2702 | Moves the player to the given map-path and coordinates by first freezing |
2669 | her, loading and preparing them map, calling the provided $check callback |
2703 | her, loading and preparing them map, calling the provided $check callback |
2670 | that has to return the map if sucecssful, and then unfreezes the player on |
2704 | that has to return the map if sucecssful, and then unfreezes the player on |
2671 | the new (success) or old (failed) map position. In either case, $done will |
2705 | the new (success) or old (failed) map position. In either case, $done will |
… | |
… | |
2678 | |
2712 | |
2679 | our $GOTOGEN; |
2713 | our $GOTOGEN; |
2680 | |
2714 | |
2681 | sub cf::object::player::goto { |
2715 | sub cf::object::player::goto { |
2682 | my ($self, $path, $x, $y, $check, $done) = @_; |
2716 | my ($self, $path, $x, $y, $check, $done) = @_; |
|
|
2717 | |
|
|
2718 | if ($self->{_link_recursion} >= $MAX_LINKS) { |
|
|
2719 | error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; |
|
|
2720 | $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); |
|
|
2721 | ($path, $x, $y) = @$EMERGENCY_POSITION; |
|
|
2722 | } |
2683 | |
2723 | |
2684 | # do generation counting so two concurrent goto's will be executed in-order |
2724 | # do generation counting so two concurrent goto's will be executed in-order |
2685 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2725 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2686 | |
2726 | |
2687 | $self->enter_link; |
2727 | $self->enter_link; |
… | |
… | |
2711 | my $map = eval { |
2751 | my $map = eval { |
2712 | my $map = defined $path ? cf::map::find $path : undef; |
2752 | my $map = defined $path ? cf::map::find $path : undef; |
2713 | |
2753 | |
2714 | if ($map) { |
2754 | if ($map) { |
2715 | $map = $map->customise_for ($self); |
2755 | $map = $map->customise_for ($self); |
2716 | $map = $check->($map) if $check && $map; |
2756 | $map = $check->($map, $x, $y, $self) if $check && $map; |
2717 | } else { |
2757 | } else { |
2718 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2758 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2719 | } |
2759 | } |
2720 | |
2760 | |
2721 | $map |
2761 | $map |
… | |
… | |
2729 | if ($gen == $self->{_goto_generation}) { |
2769 | if ($gen == $self->{_goto_generation}) { |
2730 | delete $self->{_goto_generation}; |
2770 | delete $self->{_goto_generation}; |
2731 | $self->leave_link ($map, $x, $y); |
2771 | $self->leave_link ($map, $x, $y); |
2732 | } |
2772 | } |
2733 | |
2773 | |
2734 | $done->() if $done; |
2774 | $done->($self) if $done; |
2735 | })->prio (1); |
2775 | })->prio (1); |
2736 | } |
2776 | } |
2737 | |
2777 | |
2738 | =item $player_object->enter_exit ($exit_object) |
2778 | =item $player_object->enter_exit ($exit_object) |
2739 | |
2779 | |
… | |
… | |
2832 | $self->message ("Something went wrong deep within the deliantra server. " |
2872 | $self->message ("Something went wrong deep within the deliantra server. " |
2833 | . "I'll try to bring you back to the map you were before. " |
2873 | . "I'll try to bring you back to the map you were before. " |
2834 | . "Please report this to the dungeon master!", |
2874 | . "Please report this to the dungeon master!", |
2835 | cf::NDI_UNIQUE | cf::NDI_RED); |
2875 | cf::NDI_UNIQUE | cf::NDI_RED); |
2836 | |
2876 | |
2837 | warn "ERROR in enter_exit: $@"; |
2877 | error "ERROR in enter_exit: $@"; |
2838 | $self->leave_link; |
2878 | $self->leave_link; |
2839 | } |
2879 | } |
2840 | })->prio (1); |
2880 | })->prio (1); |
2841 | } |
2881 | } |
2842 | |
2882 | |
… | |
… | |
3155 | |
3195 | |
3156 | $ns->ext_reply ($reply, @reply) |
3196 | $ns->ext_reply ($reply, @reply) |
3157 | if $reply; |
3197 | if $reply; |
3158 | |
3198 | |
3159 | } else { |
3199 | } else { |
3160 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3200 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3161 | } |
3201 | } |
3162 | |
3202 | |
3163 | cf::override; |
3203 | cf::override; |
3164 | }, |
3204 | }, |
3165 | ); |
3205 | ); |
… | |
… | |
3246 | decrease split destroy change_exp value msg lore send_msg)], |
3286 | decrease split destroy change_exp value msg lore send_msg)], |
3247 | ["cf::object::player" => qw(player)], |
3287 | ["cf::object::player" => qw(player)], |
3248 | ["cf::player" => qw(peaceful send_msg)], |
3288 | ["cf::player" => qw(peaceful send_msg)], |
3249 | ["cf::map" => qw(trigger)], |
3289 | ["cf::map" => qw(trigger)], |
3250 | ) { |
3290 | ) { |
3251 | no strict 'refs'; |
|
|
3252 | my ($pkg, @funs) = @$_; |
3291 | my ($pkg, @funs) = @$_; |
3253 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
3292 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
3254 | for @funs; |
3293 | for @funs; |
3255 | } |
3294 | } |
3256 | |
3295 | |
… | |
… | |
3295 | local @cf::_safe_eval_args = values %vars; |
3334 | local @cf::_safe_eval_args = values %vars; |
3296 | @res = wantarray ? eval eval : scalar eval $eval; |
3335 | @res = wantarray ? eval eval : scalar eval $eval; |
3297 | } |
3336 | } |
3298 | |
3337 | |
3299 | if ($@) { |
3338 | if ($@) { |
3300 | warn "$@"; |
3339 | warn "$@", |
3301 | warn "while executing safe code '$code'\n"; |
3340 | "while executing safe code '$code'\n", |
3302 | warn "with arguments " . (join " ", %vars) . "\n"; |
3341 | "with arguments " . (join " ", %vars) . "\n"; |
3303 | } |
3342 | } |
3304 | |
3343 | |
3305 | wantarray ? @res : $res[0] |
3344 | wantarray ? @res : $res[0] |
3306 | } |
3345 | } |
3307 | |
3346 | |
… | |
… | |
3341 | # for this (global event?) |
3380 | # for this (global event?) |
3342 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3381 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3343 | |
3382 | |
3344 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3383 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3345 | |
3384 | |
3346 | warn "loading facedata from $path\n"; |
3385 | trace "loading facedata from $path\n"; |
3347 | |
3386 | |
3348 | my $facedata; |
|
|
3349 | 0 < aio_load $path, $facedata |
3387 | 0 < aio_load $path, my $facedata |
3350 | or die "$path: $!"; |
3388 | or die "$path: $!"; |
3351 | |
3389 | |
3352 | $facedata = Coro::Storable::thaw $facedata; |
3390 | $facedata = Coro::Storable::thaw $facedata; |
3353 | |
3391 | |
3354 | $facedata->{version} == 2 |
3392 | $facedata->{version} == 2 |
… | |
… | |
3385 | |
3423 | |
3386 | if (my $smooth = cf::face::find $info->{smooth}) { |
3424 | if (my $smooth = cf::face::find $info->{smooth}) { |
3387 | cf::face::set_smooth $idx, $smooth; |
3425 | cf::face::set_smooth $idx, $smooth; |
3388 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3426 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3389 | } else { |
3427 | } else { |
3390 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
3428 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3391 | } |
3429 | } |
3392 | |
3430 | |
3393 | cf::cede_to_tick; |
3431 | cf::cede_to_tick; |
3394 | } |
3432 | } |
3395 | } |
3433 | } |
… | |
… | |
3413 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3451 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3414 | |
3452 | |
3415 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3453 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3416 | cf::face::set_type $idx, $info->{type}; |
3454 | cf::face::set_type $idx, $info->{type}; |
3417 | } else { |
3455 | } else { |
3418 | $RESOURCE{$name} = $info; |
3456 | $RESOURCE{$name} = $info; # unused |
3419 | } |
3457 | } |
3420 | |
3458 | |
3421 | cf::cede_to_tick; |
3459 | cf::cede_to_tick; |
3422 | } |
3460 | } |
3423 | } |
3461 | } |
3424 | |
3462 | |
3425 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3463 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3426 | |
3464 | |
3427 | 1 |
3465 | 1 |
3428 | } |
3466 | } |
3429 | |
|
|
3430 | cf::global->attach (on_resource_update => sub { |
|
|
3431 | if (my $soundconf = $RESOURCE{"res/sound.conf"}) { |
|
|
3432 | $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data}); |
|
|
3433 | |
|
|
3434 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
3435 | my $sound = $soundconf->{compat}[$_] |
|
|
3436 | or next; |
|
|
3437 | |
|
|
3438 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
3439 | cf::sound::set $sound->[0] => $face; |
|
|
3440 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
3441 | } |
|
|
3442 | |
|
|
3443 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
3444 | my $face = cf::face::find "sound/$v"; |
|
|
3445 | cf::sound::set $k => $face; |
|
|
3446 | } |
|
|
3447 | } |
|
|
3448 | }); |
|
|
3449 | |
3467 | |
3450 | register_exticmd fx_want => sub { |
3468 | register_exticmd fx_want => sub { |
3451 | my ($ns, $want) = @_; |
3469 | my ($ns, $want) = @_; |
3452 | |
3470 | |
3453 | while (my ($k, $v) = each %$want) { |
3471 | while (my ($k, $v) = each %$want) { |
… | |
… | |
3492 | sub reload_treasures { |
3510 | sub reload_treasures { |
3493 | load_resource_file "$DATADIR/treasures" |
3511 | load_resource_file "$DATADIR/treasures" |
3494 | or die "unable to load treasurelists\n"; |
3512 | or die "unable to load treasurelists\n"; |
3495 | } |
3513 | } |
3496 | |
3514 | |
|
|
3515 | sub reload_sound { |
|
|
3516 | trace "loading sound config from $DATADIR/sound\n"; |
|
|
3517 | |
|
|
3518 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
|
|
3519 | or die "$DATADIR/sound $!"; |
|
|
3520 | |
|
|
3521 | my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); |
|
|
3522 | |
|
|
3523 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
3524 | my $sound = $soundconf->{compat}[$_] |
|
|
3525 | or next; |
|
|
3526 | |
|
|
3527 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
3528 | cf::sound::set $sound->[0] => $face; |
|
|
3529 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
3530 | } |
|
|
3531 | |
|
|
3532 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
3533 | my $face = cf::face::find "sound/$v"; |
|
|
3534 | cf::sound::set $k => $face; |
|
|
3535 | } |
|
|
3536 | } |
|
|
3537 | |
3497 | sub reload_resources { |
3538 | sub reload_resources { |
3498 | warn "reloading resource files...\n"; |
3539 | trace "reloading resource files...\n"; |
3499 | |
3540 | |
|
|
3541 | reload_exp_table; |
|
|
3542 | reload_materials; |
3500 | reload_facedata; |
3543 | reload_facedata; |
|
|
3544 | reload_sound; |
3501 | reload_archetypes; |
3545 | reload_archetypes; |
3502 | reload_regions; |
3546 | reload_regions; |
3503 | reload_treasures; |
3547 | reload_treasures; |
3504 | |
3548 | |
3505 | warn "finished reloading resource files\n"; |
3549 | trace "finished reloading resource files\n"; |
3506 | } |
3550 | } |
3507 | |
3551 | |
3508 | sub reload_config { |
3552 | sub reload_config { |
3509 | warn "reloading config file...\n"; |
3553 | trace "reloading config file...\n"; |
3510 | |
3554 | |
3511 | open my $fh, "<:utf8", "$CONFDIR/config" |
3555 | 0 < aio_load "$CONFDIR/config", my $config |
3512 | or return; |
3556 | or die "$CONFDIR/config: $!"; |
3513 | |
3557 | |
3514 | local $/; |
3558 | utf8::decode $config; |
|
|
3559 | |
|
|
3560 | cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow... |
3515 | *CFG = YAML::XS::Load scalar <$fh>; |
3561 | *CFG = YAML::XS::Load $config; |
3516 | |
3562 | |
3517 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; |
3563 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3518 | |
3564 | |
3519 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3565 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3520 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3566 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3521 | |
3567 | |
3522 | if (exists $CFG{mlockall}) { |
3568 | if (exists $CFG{mlockall}) { |
… | |
… | |
3524 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3570 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3525 | and die "WARNING: m(un)lockall failed: $!\n"; |
3571 | and die "WARNING: m(un)lockall failed: $!\n"; |
3526 | }; |
3572 | }; |
3527 | warn $@ if $@; |
3573 | warn $@ if $@; |
3528 | } |
3574 | } |
3529 | |
|
|
3530 | warn "finished reloading resource files\n"; |
|
|
3531 | } |
3575 | } |
3532 | |
3576 | |
3533 | sub pidfile() { |
3577 | sub pidfile() { |
3534 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3578 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3535 | or die "$PIDFILE: $!"; |
3579 | or die "$PIDFILE: $!"; |
… | |
… | |
3548 | seek $fh, 0, 0; |
3592 | seek $fh, 0, 0; |
3549 | print $fh $$; |
3593 | print $fh $$; |
3550 | } |
3594 | } |
3551 | |
3595 | |
3552 | sub main_loop { |
3596 | sub main_loop { |
3553 | warn "EV::loop starting\n"; |
3597 | trace "EV::loop starting\n"; |
3554 | if (1) { |
3598 | if (1) { |
3555 | EV::loop; |
3599 | EV::loop; |
3556 | } |
3600 | } |
3557 | warn "EV::loop returned\n"; |
3601 | trace "EV::loop returned\n"; |
3558 | goto &main_loop unless $REALLY_UNLOOP; |
3602 | goto &main_loop unless $REALLY_UNLOOP; |
3559 | } |
3603 | } |
3560 | |
3604 | |
3561 | sub main { |
3605 | sub main { |
3562 | cf::init_globals; # initialise logging |
3606 | cf::init_globals; # initialise logging |
3563 | |
3607 | |
3564 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3608 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3565 | LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3609 | LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3566 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3610 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3567 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3611 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3568 | |
3612 | |
3569 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3613 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3570 | |
3614 | |
… | |
… | |
3578 | }; |
3622 | }; |
3579 | |
3623 | |
3580 | evthread_start IO::AIO::poll_fileno; |
3624 | evthread_start IO::AIO::poll_fileno; |
3581 | |
3625 | |
3582 | cf::sync_job { |
3626 | cf::sync_job { |
3583 | cf::init_experience; |
3627 | cf::incloader::init (); |
|
|
3628 | |
3584 | cf::init_anim; |
3629 | cf::init_anim; |
3585 | cf::init_attackmess; |
3630 | cf::init_attackmess; |
3586 | cf::init_dynamic; |
3631 | cf::init_dynamic; |
3587 | |
3632 | |
3588 | cf::load_settings; |
3633 | cf::load_settings; |
3589 | cf::load_materials; |
|
|
3590 | |
3634 | |
3591 | reload_resources; |
3635 | reload_resources; |
3592 | reload_config; |
3636 | reload_config; |
3593 | db_init; |
3637 | db_init; |
3594 | |
3638 | |
… | |
… | |
3610 | |
3654 | |
3611 | (pop @POST_INIT)->(0) while @POST_INIT; |
3655 | (pop @POST_INIT)->(0) while @POST_INIT; |
3612 | }; |
3656 | }; |
3613 | |
3657 | |
3614 | cf::object::thawer::errors_are_fatal 0; |
3658 | cf::object::thawer::errors_are_fatal 0; |
3615 | warn "parse errors in files are no longer fatal from this point on.\n"; |
3659 | info "parse errors in files are no longer fatal from this point on.\n"; |
3616 | |
3660 | |
|
|
3661 | my $free_main; $free_main = EV::idle sub { |
|
|
3662 | undef $free_main; |
|
|
3663 | undef &main; # free gobs of memory :) |
|
|
3664 | }; |
|
|
3665 | |
3617 | main_loop; |
3666 | goto &main_loop; |
3618 | } |
3667 | } |
3619 | |
3668 | |
3620 | ############################################################################# |
3669 | ############################################################################# |
3621 | # initialisation and cleanup |
3670 | # initialisation and cleanup |
3622 | |
3671 | |
… | |
… | |
3661 | or return; |
3710 | or return; |
3662 | |
3711 | |
3663 | aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE |
3712 | aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE |
3664 | and return; |
3713 | and return; |
3665 | |
3714 | |
3666 | warn sprintf "runtime file written (%gs).\n", AE::time - $t0; |
3715 | trace sprintf "runtime file written (%gs).\n", AE::time - $t0; |
3667 | |
3716 | |
3668 | 1 |
3717 | 1 |
3669 | } |
3718 | } |
3670 | |
3719 | |
3671 | our $uuid_lock; |
3720 | our $uuid_lock; |
… | |
… | |
3683 | or return; |
3732 | or return; |
3684 | |
3733 | |
3685 | my $value = uuid_seq uuid_cur; |
3734 | my $value = uuid_seq uuid_cur; |
3686 | |
3735 | |
3687 | unless ($value) { |
3736 | unless ($value) { |
3688 | warn "cowardly refusing to write zero uuid value!\n"; |
3737 | info "cowardly refusing to write zero uuid value!\n"; |
3689 | return; |
3738 | return; |
3690 | } |
3739 | } |
3691 | |
3740 | |
3692 | my $value = uuid_str $value + $uuid_skip; |
3741 | my $value = uuid_str $value + $uuid_skip; |
3693 | $uuid_skip = 0; |
3742 | $uuid_skip = 0; |
… | |
… | |
3703 | or return; |
3752 | or return; |
3704 | |
3753 | |
3705 | aio_rename "$uuid~", $uuid |
3754 | aio_rename "$uuid~", $uuid |
3706 | and return; |
3755 | and return; |
3707 | |
3756 | |
3708 | warn "uuid file written ($value).\n"; |
3757 | trace "uuid file written ($value).\n"; |
3709 | |
3758 | |
3710 | 1 |
3759 | 1 |
3711 | |
3760 | |
3712 | } |
3761 | } |
3713 | |
3762 | |
… | |
… | |
3719 | } |
3768 | } |
3720 | |
3769 | |
3721 | sub emergency_save() { |
3770 | sub emergency_save() { |
3722 | my $freeze_guard = cf::freeze_mainloop; |
3771 | my $freeze_guard = cf::freeze_mainloop; |
3723 | |
3772 | |
3724 | warn "emergency_perl_save: enter\n"; |
3773 | info "emergency_perl_save: enter\n"; |
|
|
3774 | |
|
|
3775 | # this is a trade-off: we want to be very quick here, so |
|
|
3776 | # save all maps without fsync, and later call a global sync |
|
|
3777 | # (which in turn might be very very slow) |
|
|
3778 | local $USE_FSYNC = 0; |
3725 | |
3779 | |
3726 | cf::sync_job { |
3780 | cf::sync_job { |
3727 | # this is a trade-off: we want to be very quick here, so |
3781 | cf::write_runtime_sync; # external watchdog should not bark |
3728 | # save all maps without fsync, and later call a global sync |
|
|
3729 | # (which in turn might be very very slow) |
|
|
3730 | local $USE_FSYNC = 0; |
|
|
3731 | |
3782 | |
3732 | # use a peculiar iteration method to avoid tripping on perl |
3783 | # use a peculiar iteration method to avoid tripping on perl |
3733 | # refcount bugs in for. also avoids problems with players |
3784 | # refcount bugs in for. also avoids problems with players |
3734 | # and maps saved/destroyed asynchronously. |
3785 | # and maps saved/destroyed asynchronously. |
3735 | warn "emergency_perl_save: begin player save\n"; |
3786 | info "emergency_perl_save: begin player save\n"; |
3736 | for my $login (keys %cf::PLAYER) { |
3787 | for my $login (keys %cf::PLAYER) { |
3737 | my $pl = $cf::PLAYER{$login} or next; |
3788 | my $pl = $cf::PLAYER{$login} or next; |
3738 | $pl->valid or next; |
3789 | $pl->valid or next; |
3739 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3790 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3740 | $pl->save; |
3791 | $pl->save; |
3741 | } |
3792 | } |
3742 | warn "emergency_perl_save: end player save\n"; |
3793 | info "emergency_perl_save: end player save\n"; |
3743 | |
3794 | |
|
|
3795 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3796 | |
3744 | warn "emergency_perl_save: begin map save\n"; |
3797 | info "emergency_perl_save: begin map save\n"; |
3745 | for my $path (keys %cf::MAP) { |
3798 | for my $path (keys %cf::MAP) { |
3746 | my $map = $cf::MAP{$path} or next; |
3799 | my $map = $cf::MAP{$path} or next; |
3747 | $map->valid or next; |
3800 | $map->valid or next; |
3748 | $map->save; |
3801 | $map->save; |
3749 | } |
3802 | } |
3750 | warn "emergency_perl_save: end map save\n"; |
3803 | info "emergency_perl_save: end map save\n"; |
3751 | |
3804 | |
|
|
3805 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3806 | |
3752 | warn "emergency_perl_save: begin database checkpoint\n"; |
3807 | info "emergency_perl_save: begin database checkpoint\n"; |
3753 | BDB::db_env_txn_checkpoint $DB_ENV; |
3808 | BDB::db_env_txn_checkpoint $DB_ENV; |
3754 | warn "emergency_perl_save: end database checkpoint\n"; |
3809 | info "emergency_perl_save: end database checkpoint\n"; |
3755 | |
3810 | |
3756 | warn "emergency_perl_save: begin write uuid\n"; |
3811 | info "emergency_perl_save: begin write uuid\n"; |
3757 | write_uuid_sync 1; |
3812 | write_uuid_sync 1; |
3758 | warn "emergency_perl_save: end write uuid\n"; |
3813 | info "emergency_perl_save: end write uuid\n"; |
|
|
3814 | |
|
|
3815 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3816 | |
|
|
3817 | trace "emergency_perl_save: syncing database to disk"; |
|
|
3818 | BDB::db_env_txn_checkpoint $DB_ENV; |
|
|
3819 | |
|
|
3820 | info "emergency_perl_save: starting sync\n"; |
|
|
3821 | IO::AIO::aio_sync sub { |
|
|
3822 | info "emergency_perl_save: finished sync\n"; |
|
|
3823 | }; |
|
|
3824 | |
|
|
3825 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3826 | |
|
|
3827 | trace "emergency_perl_save: flushing outstanding aio requests"; |
|
|
3828 | while (IO::AIO::nreqs || BDB::nreqs) { |
|
|
3829 | Coro::EV::timer_once 0.01; # let the sync_job do it's thing |
|
|
3830 | } |
|
|
3831 | |
|
|
3832 | cf::write_runtime_sync; # external watchdog should not bark |
3759 | }; |
3833 | }; |
3760 | |
3834 | |
3761 | warn "emergency_perl_save: starting sync()\n"; |
|
|
3762 | IO::AIO::aio_sync sub { |
|
|
3763 | warn "emergency_perl_save: finished sync()\n"; |
|
|
3764 | }; |
|
|
3765 | |
|
|
3766 | warn "emergency_perl_save: leave\n"; |
3835 | info "emergency_perl_save: leave\n"; |
3767 | } |
3836 | } |
3768 | |
3837 | |
3769 | sub post_cleanup { |
3838 | sub post_cleanup { |
3770 | my ($make_core) = @_; |
3839 | my ($make_core) = @_; |
3771 | |
3840 | |
|
|
3841 | IO::AIO::flush; |
|
|
3842 | |
3772 | warn Carp::longmess "post_cleanup backtrace" |
3843 | error Carp::longmess "post_cleanup backtrace" |
3773 | if $make_core; |
3844 | if $make_core; |
3774 | |
3845 | |
3775 | my $fh = pidfile; |
3846 | my $fh = pidfile; |
3776 | unlink $PIDFILE if <$fh> == $$; |
3847 | unlink $PIDFILE if <$fh> == $$; |
3777 | } |
3848 | } |
… | |
… | |
3801 | } |
3872 | } |
3802 | } |
3873 | } |
3803 | |
3874 | |
3804 | sub do_reload_perl() { |
3875 | sub do_reload_perl() { |
3805 | # can/must only be called in main |
3876 | # can/must only be called in main |
3806 | if (in_main) { |
3877 | unless (in_main) { |
3807 | warn "can only reload from main coroutine"; |
3878 | error "can only reload from main coroutine"; |
3808 | return; |
3879 | return; |
3809 | } |
3880 | } |
3810 | |
3881 | |
3811 | return if $RELOAD++; |
3882 | return if $RELOAD++; |
3812 | |
3883 | |
3813 | my $t1 = AE::time; |
3884 | my $t1 = AE::time; |
3814 | |
3885 | |
3815 | while ($RELOAD) { |
3886 | while ($RELOAD) { |
|
|
3887 | cf::get_slot 0.1, -1, "reload_perl"; |
3816 | warn "reloading..."; |
3888 | info "reloading..."; |
3817 | |
3889 | |
3818 | warn "entering sync_job"; |
3890 | trace "entering sync_job"; |
3819 | |
3891 | |
3820 | cf::sync_job { |
3892 | cf::sync_job { |
3821 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3822 | cf::emergency_save; |
3893 | #cf::emergency_save; |
3823 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3824 | |
3894 | |
3825 | warn "syncing database to disk"; |
|
|
3826 | BDB::db_env_txn_checkpoint $DB_ENV; |
|
|
3827 | |
|
|
3828 | # if anything goes wrong in here, we should simply crash as we already saved |
|
|
3829 | |
|
|
3830 | warn "flushing outstanding aio requests"; |
|
|
3831 | while (IO::AIO::nreqs || BDB::nreqs) { |
|
|
3832 | Coro::EV::timer_once 0.01; # let the sync_job do it's thing |
|
|
3833 | } |
|
|
3834 | |
|
|
3835 | warn "cancelling all extension coros"; |
3895 | trace "cancelling all extension coros"; |
3836 | $_->cancel for values %EXT_CORO; |
3896 | $_->cancel for values %EXT_CORO; |
3837 | %EXT_CORO = (); |
3897 | %EXT_CORO = (); |
3838 | |
3898 | |
3839 | warn "removing commands"; |
3899 | trace "removing commands"; |
3840 | %COMMAND = (); |
3900 | %COMMAND = (); |
3841 | |
3901 | |
3842 | warn "removing ext/exti commands"; |
3902 | trace "removing ext/exti commands"; |
3843 | %EXTCMD = (); |
3903 | %EXTCMD = (); |
3844 | %EXTICMD = (); |
3904 | %EXTICMD = (); |
3845 | |
3905 | |
3846 | warn "unloading/nuking all extensions"; |
3906 | trace "unloading/nuking all extensions"; |
3847 | for my $pkg (@EXTS) { |
3907 | for my $pkg (@EXTS) { |
3848 | warn "... unloading $pkg"; |
3908 | trace "... unloading $pkg"; |
3849 | |
3909 | |
3850 | if (my $cb = $pkg->can ("unload")) { |
3910 | if (my $cb = $pkg->can ("unload")) { |
3851 | eval { |
3911 | eval { |
3852 | $cb->($pkg); |
3912 | $cb->($pkg); |
3853 | 1 |
3913 | 1 |
3854 | } or warn "$pkg unloaded, but with errors: $@"; |
3914 | } or error "$pkg unloaded, but with errors: $@"; |
3855 | } |
3915 | } |
3856 | |
3916 | |
3857 | warn "... clearing $pkg"; |
3917 | trace "... clearing $pkg"; |
3858 | clear_package $pkg; |
3918 | clear_package $pkg; |
3859 | } |
3919 | } |
3860 | |
3920 | |
3861 | warn "unloading all perl modules loaded from $LIBDIR"; |
3921 | trace "unloading all perl modules loaded from $LIBDIR"; |
3862 | while (my ($k, $v) = each %INC) { |
3922 | while (my ($k, $v) = each %INC) { |
3863 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3923 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3864 | |
3924 | |
3865 | warn "... unloading $k"; |
3925 | trace "... unloading $k"; |
3866 | delete $INC{$k}; |
3926 | delete $INC{$k}; |
3867 | |
3927 | |
3868 | $k =~ s/\.pm$//; |
3928 | $k =~ s/\.pm$//; |
3869 | $k =~ s/\//::/g; |
3929 | $k =~ s/\//::/g; |
3870 | |
3930 | |
… | |
… | |
3873 | } |
3933 | } |
3874 | |
3934 | |
3875 | clear_package $k; |
3935 | clear_package $k; |
3876 | } |
3936 | } |
3877 | |
3937 | |
3878 | warn "getting rid of safe::, as good as possible"; |
3938 | trace "getting rid of safe::, as good as possible"; |
3879 | clear_package "safe::$_" |
3939 | clear_package "safe::$_" |
3880 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3940 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3881 | |
3941 | |
3882 | warn "unloading cf.pm \"a bit\""; |
3942 | trace "unloading cf.pm \"a bit\""; |
3883 | delete $INC{"cf.pm"}; |
3943 | delete $INC{"cf.pm"}; |
3884 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3944 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3885 | |
3945 | |
3886 | # don't, removes xs symbols, too, |
3946 | # don't, removes xs symbols, too, |
3887 | # and global variables created in xs |
3947 | # and global variables created in xs |
3888 | #clear_package __PACKAGE__; |
3948 | #clear_package __PACKAGE__; |
3889 | |
3949 | |
3890 | warn "unload completed, starting to reload now"; |
3950 | info "unload completed, starting to reload now"; |
3891 | |
3951 | |
3892 | warn "reloading cf.pm"; |
3952 | trace "reloading cf.pm"; |
3893 | require cf; |
3953 | require cf; |
3894 | cf::_connect_to_perl_1; |
3954 | cf::_connect_to_perl_1; |
3895 | |
3955 | |
3896 | warn "loading config and database again"; |
3956 | trace "loading config and database again"; |
3897 | cf::reload_config; |
3957 | cf::reload_config; |
3898 | |
3958 | |
3899 | warn "loading extensions"; |
3959 | trace "loading extensions"; |
3900 | cf::load_extensions; |
3960 | cf::load_extensions; |
3901 | |
3961 | |
3902 | if ($REATTACH_ON_RELOAD) { |
3962 | if ($REATTACH_ON_RELOAD) { |
3903 | warn "reattaching attachments to objects/players"; |
3963 | trace "reattaching attachments to objects/players"; |
3904 | _global_reattach; # objects, sockets |
3964 | _global_reattach; # objects, sockets |
3905 | warn "reattaching attachments to maps"; |
3965 | trace "reattaching attachments to maps"; |
3906 | reattach $_ for values %MAP; |
3966 | reattach $_ for values %MAP; |
3907 | warn "reattaching attachments to players"; |
3967 | trace "reattaching attachments to players"; |
3908 | reattach $_ for values %PLAYER; |
3968 | reattach $_ for values %PLAYER; |
3909 | } |
3969 | } |
3910 | |
3970 | |
3911 | warn "running post_init jobs"; |
3971 | trace "running post_init jobs"; |
3912 | (pop @POST_INIT)->(1) while @POST_INIT; |
3972 | (pop @POST_INIT)->(1) while @POST_INIT; |
3913 | |
3973 | |
3914 | warn "leaving sync_job"; |
3974 | trace "leaving sync_job"; |
3915 | |
3975 | |
3916 | 1 |
3976 | 1 |
3917 | } or do { |
3977 | } or do { |
3918 | warn $@; |
3978 | error $@; |
3919 | cf::cleanup "error while reloading, exiting."; |
3979 | cf::cleanup "error while reloading, exiting."; |
3920 | }; |
3980 | }; |
3921 | |
3981 | |
3922 | warn "reloaded"; |
3982 | info "reloaded"; |
3923 | --$RELOAD; |
3983 | --$RELOAD; |
3924 | } |
3984 | } |
3925 | |
3985 | |
3926 | $t1 = AE::time - $t1; |
3986 | $t1 = AE::time - $t1; |
3927 | warn "reload completed in ${t1}s\n"; |
3987 | info "reload completed in ${t1}s\n"; |
3928 | }; |
3988 | }; |
3929 | |
3989 | |
3930 | our $RELOAD_WATCHER; # used only during reload |
3990 | our $RELOAD_WATCHER; # used only during reload |
3931 | |
3991 | |
3932 | sub reload_perl() { |
3992 | sub reload_perl() { |
… | |
… | |
3953 | reload_perl; |
4013 | reload_perl; |
3954 | }; |
4014 | }; |
3955 | } |
4015 | } |
3956 | }; |
4016 | }; |
3957 | |
4017 | |
3958 | unshift @INC, $LIBDIR; |
4018 | ############################################################################# |
3959 | |
4019 | |
3960 | my $bug_warning = 0; |
4020 | my $bug_warning = 0; |
3961 | |
4021 | |
3962 | our @WAIT_FOR_TICK; |
4022 | our @WAIT_FOR_TICK; |
3963 | our @WAIT_FOR_TICK_BEGIN; |
4023 | our @WAIT_FOR_TICK_BEGIN; |
3964 | |
4024 | |
3965 | sub wait_for_tick { |
4025 | sub wait_for_tick() { |
3966 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4026 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
3967 | |
4027 | |
3968 | my $signal = new Coro::Signal; |
4028 | my $signal = new Coro::Signal; |
3969 | push @WAIT_FOR_TICK, $signal; |
4029 | push @WAIT_FOR_TICK, $signal; |
3970 | $signal->wait; |
4030 | $signal->wait; |
3971 | } |
4031 | } |
3972 | |
4032 | |
3973 | sub wait_for_tick_begin { |
4033 | sub wait_for_tick_begin() { |
3974 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4034 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
3975 | |
4035 | |
3976 | my $signal = new Coro::Signal; |
4036 | my $signal = new Coro::Signal; |
3977 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4037 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3978 | $signal->wait; |
4038 | $signal->wait; |
… | |
… | |
3992 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
4052 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3993 | $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; |
4053 | $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; |
3994 | Coro::async_pool { |
4054 | Coro::async_pool { |
3995 | $Coro::current->{desc} = "runtime saver"; |
4055 | $Coro::current->{desc} = "runtime saver"; |
3996 | write_runtime_sync |
4056 | write_runtime_sync |
3997 | or warn "ERROR: unable to write runtime file: $!"; |
4057 | or error "ERROR: unable to write runtime file: $!"; |
3998 | }; |
4058 | }; |
3999 | } |
4059 | } |
4000 | |
4060 | |
4001 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
4061 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
4002 | $sig->send; |
4062 | $sig->send; |
… | |
… | |
4010 | |
4070 | |
4011 | if (0) { |
4071 | if (0) { |
4012 | if ($NEXT_TICK) { |
4072 | if ($NEXT_TICK) { |
4013 | my $jitter = $TICK_START - $NEXT_TICK; |
4073 | my $jitter = $TICK_START - $NEXT_TICK; |
4014 | $JITTER = $JITTER * 0.75 + $jitter * 0.25; |
4074 | $JITTER = $JITTER * 0.75 + $jitter * 0.25; |
4015 | warn "jitter $JITTER\n";#d# |
4075 | debug "jitter $JITTER\n";#d# |
4016 | } |
4076 | } |
4017 | } |
4077 | } |
4018 | } |
4078 | } |
4019 | |
4079 | |
4020 | { |
4080 | { |