… | |
… | |
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) { |
… | |
… | |
648 | within each server. |
662 | within each server. |
649 | |
663 | |
650 | =cut |
664 | =cut |
651 | |
665 | |
652 | sub db_table($) { |
666 | sub db_table($) { |
|
|
667 | cf::error "db_get called from main context" |
|
|
668 | if $Coro::current == $Coro::main; |
|
|
669 | |
653 | my ($name) = @_; |
670 | my ($name) = @_; |
654 | my $db = BDB::db_create $DB_ENV; |
671 | my $db = BDB::db_create $DB_ENV; |
655 | |
672 | |
656 | eval { |
673 | eval { |
657 | $db->set_flags (BDB::CHKSUM); |
674 | $db->set_flags (BDB::CHKSUM); |
… | |
… | |
667 | } |
684 | } |
668 | |
685 | |
669 | our $DB; |
686 | our $DB; |
670 | |
687 | |
671 | sub db_init { |
688 | sub db_init { |
672 | cf::sync_job { |
|
|
673 | $DB ||= db_table "db"; |
689 | $DB ||= db_table "db"; |
674 | }; |
|
|
675 | } |
690 | } |
676 | |
691 | |
677 | sub db_get($$) { |
692 | sub db_get($$) { |
678 | my $key = "$_[0]/$_[1]"; |
693 | my $key = "$_[0]/$_[1]"; |
679 | |
694 | |
680 | cf::sync_job { |
695 | cf::error "db_get called from main context" |
|
|
696 | if $Coro::current == $Coro::main; |
|
|
697 | |
681 | BDB::db_get $DB, undef, $key, my $data; |
698 | BDB::db_get $DB, undef, $key, my $data; |
682 | |
699 | |
683 | $! ? () |
700 | $! ? () |
684 | : $data |
701 | : $data |
685 | } |
|
|
686 | } |
702 | } |
687 | |
703 | |
688 | sub db_put($$$) { |
704 | sub db_put($$$) { |
689 | BDB::dbreq_pri 4; |
705 | BDB::dbreq_pri 4; |
690 | BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; |
706 | BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; |
… | |
… | |
746 | |
762 | |
747 | my $t1 = Time::HiRes::time; |
763 | my $t1 = Time::HiRes::time; |
748 | my $data = $process->(\@data); |
764 | my $data = $process->(\@data); |
749 | my $t2 = Time::HiRes::time; |
765 | my $t2 = Time::HiRes::time; |
750 | |
766 | |
751 | warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
767 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
752 | |
768 | |
753 | db_put cache => "$id/data", $data; |
769 | db_put cache => "$id/data", $data; |
754 | db_put cache => "$id/md5" , $md5; |
770 | db_put cache => "$id/md5" , $md5; |
755 | db_put cache => "$id/meta", $meta; |
771 | db_put cache => "$id/meta", $meta; |
756 | |
772 | |
… | |
… | |
766 | |
782 | |
767 | =cut |
783 | =cut |
768 | |
784 | |
769 | sub datalog($@) { |
785 | sub datalog($@) { |
770 | my ($type, %kv) = @_; |
786 | my ($type, %kv) = @_; |
771 | warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); |
787 | info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); |
772 | } |
788 | } |
773 | |
789 | |
774 | =back |
790 | =back |
775 | |
791 | |
776 | =cut |
792 | =cut |
… | |
… | |
971 | |
987 | |
972 | } elsif (exists $cb_id{$type}) { |
988 | } elsif (exists $cb_id{$type}) { |
973 | _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; |
989 | _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; |
974 | |
990 | |
975 | } elsif (ref $type) { |
991 | } elsif (ref $type) { |
976 | warn "attaching objects not supported, ignoring.\n"; |
992 | error "attaching objects not supported, ignoring.\n"; |
977 | |
993 | |
978 | } else { |
994 | } else { |
979 | shift @arg; |
995 | shift @arg; |
980 | warn "attach argument '$type' not supported, ignoring.\n"; |
996 | error "attach argument '$type' not supported, ignoring.\n"; |
981 | } |
997 | } |
982 | } |
998 | } |
983 | } |
999 | } |
984 | |
1000 | |
985 | sub _object_attach { |
1001 | sub _object_attach { |
… | |
… | |
995 | _attach $registry, $klass, @attach; |
1011 | _attach $registry, $klass, @attach; |
996 | } |
1012 | } |
997 | |
1013 | |
998 | $obj->{$name} = \%arg; |
1014 | $obj->{$name} = \%arg; |
999 | } else { |
1015 | } else { |
1000 | warn "object uses attachment '$name' which is not available, postponing.\n"; |
1016 | info "object uses attachment '$name' which is not available, postponing.\n"; |
1001 | } |
1017 | } |
1002 | |
1018 | |
1003 | $obj->{_attachment}{$name} = undef; |
1019 | $obj->{_attachment}{$name} = undef; |
1004 | } |
1020 | } |
1005 | |
1021 | |
… | |
… | |
1064 | |
1080 | |
1065 | for (@$callbacks) { |
1081 | for (@$callbacks) { |
1066 | eval { &{$_->[1]} }; |
1082 | eval { &{$_->[1]} }; |
1067 | |
1083 | |
1068 | if ($@) { |
1084 | if ($@) { |
1069 | warn "$@"; |
|
|
1070 | warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; |
1085 | error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; |
1071 | override; |
1086 | override; |
1072 | } |
1087 | } |
1073 | |
1088 | |
1074 | return 1 if $override; |
1089 | return 1 if $override; |
1075 | } |
1090 | } |
… | |
… | |
1154 | for (@$attach) { |
1169 | for (@$attach) { |
1155 | my ($klass, @attach) = @$_; |
1170 | my ($klass, @attach) = @$_; |
1156 | _attach $registry, $klass, @attach; |
1171 | _attach $registry, $klass, @attach; |
1157 | } |
1172 | } |
1158 | } else { |
1173 | } else { |
1159 | warn "object uses attachment '$name' that is not available, postponing.\n"; |
1174 | info "object uses attachment '$name' that is not available, postponing.\n"; |
1160 | } |
1175 | } |
1161 | } |
1176 | } |
1162 | } |
1177 | } |
1163 | |
1178 | |
1164 | cf::attachable->attach ( |
1179 | cf::attachable->attach ( |
… | |
… | |
1191 | my ($filename, $rdata, $objs) = @_; |
1206 | my ($filename, $rdata, $objs) = @_; |
1192 | |
1207 | |
1193 | sync_job { |
1208 | sync_job { |
1194 | if (length $$rdata) { |
1209 | if (length $$rdata) { |
1195 | utf8::decode (my $decname = $filename); |
1210 | utf8::decode (my $decname = $filename); |
1196 | warn sprintf "saving %s (%d,%d)\n", |
1211 | trace sprintf "saving %s (%d,%d)\n", |
1197 | $decname, length $$rdata, scalar @$objs; |
1212 | $decname, length $$rdata, scalar @$objs |
|
|
1213 | if $VERBOSE_IO; |
1198 | |
1214 | |
1199 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1215 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1200 | aio_chmod $fh, SAVE_MODE; |
1216 | aio_chmod $fh, SAVE_MODE; |
1201 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1217 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1202 | if ($cf::USE_FSYNC) { |
1218 | if ($cf::USE_FSYNC) { |
… | |
… | |
1224 | aio_rename "$filename~", $filename; |
1240 | aio_rename "$filename~", $filename; |
1225 | |
1241 | |
1226 | $filename =~ s%/[^/]+$%%; |
1242 | $filename =~ s%/[^/]+$%%; |
1227 | aio_pathsync $filename if $cf::USE_FSYNC; |
1243 | aio_pathsync $filename if $cf::USE_FSYNC; |
1228 | } else { |
1244 | } else { |
1229 | warn "unable to save objects: $filename~: $!\n"; |
1245 | error "unable to save objects: $filename~: $!\n"; |
1230 | } |
1246 | } |
1231 | } else { |
1247 | } else { |
1232 | aio_unlink $filename; |
1248 | aio_unlink $filename; |
1233 | aio_unlink "$filename.pst"; |
1249 | aio_unlink "$filename.pst"; |
1234 | } |
1250 | } |
… | |
… | |
1258 | my $st = eval { Coro::Storable::thaw $av }; |
1274 | my $st = eval { Coro::Storable::thaw $av }; |
1259 | $av = $st->{objs}; |
1275 | $av = $st->{objs}; |
1260 | } |
1276 | } |
1261 | |
1277 | |
1262 | utf8::decode (my $decname = $filename); |
1278 | utf8::decode (my $decname = $filename); |
1263 | warn sprintf "loading %s (%d,%d)\n", |
1279 | trace sprintf "loading %s (%d,%d)\n", |
1264 | $decname, length $data, scalar @{$av || []}; |
1280 | $decname, length $data, scalar @{$av || []} |
|
|
1281 | if $VERBOSE_IO; |
1265 | |
1282 | |
1266 | ($data, $av) |
1283 | ($data, $av) |
1267 | } |
1284 | } |
1268 | |
1285 | |
1269 | =head2 COMMAND CALLBACKS |
1286 | =head2 COMMAND CALLBACKS |
… | |
… | |
1361 | |
1378 | |
1362 | $pl->ext_reply ($reply, @reply) |
1379 | $pl->ext_reply ($reply, @reply) |
1363 | if $reply; |
1380 | if $reply; |
1364 | |
1381 | |
1365 | } else { |
1382 | } else { |
1366 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1383 | error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1367 | } |
1384 | } |
1368 | |
1385 | |
1369 | cf::override; |
1386 | cf::override; |
1370 | }, |
1387 | }, |
1371 | ); |
1388 | ); |
… | |
… | |
1382 | |
1399 | |
1383 | $grp |
1400 | $grp |
1384 | } |
1401 | } |
1385 | |
1402 | |
1386 | sub load_extensions { |
1403 | sub load_extensions { |
|
|
1404 | info "loading extensions..."; |
|
|
1405 | |
1387 | cf::sync_job { |
1406 | cf::sync_job { |
1388 | my %todo; |
1407 | my %todo; |
1389 | |
1408 | |
1390 | for my $path (<$LIBDIR/*.ext>) { |
1409 | for my $path (<$LIBDIR/*.ext>) { |
1391 | next unless -r $path; |
1410 | next unless -r $path; |
… | |
… | |
1409 | |
1428 | |
1410 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1429 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1411 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1430 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1412 | |
1431 | |
1413 | $ext{source} = |
1432 | $ext{source} = |
1414 | "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" |
1433 | "package $pkg; use common::sense;\n" |
1415 | . "#line 1 \"$path\"\n{\n" |
1434 | . "#line 1 \"$path\"\n{\n" |
1416 | . $source |
1435 | . $source |
1417 | . "\n};\n1"; |
1436 | . "\n};\n1"; |
1418 | |
1437 | |
1419 | $todo{$base} = \%ext; |
1438 | $todo{$base} = \%ext; |
… | |
… | |
1431 | for (split /,\s*/, $v->{meta}{depends}) { |
1450 | for (split /,\s*/, $v->{meta}{depends}) { |
1432 | next ext |
1451 | next ext |
1433 | unless exists $done{$_}; |
1452 | unless exists $done{$_}; |
1434 | } |
1453 | } |
1435 | |
1454 | |
1436 | warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; |
1455 | trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; |
1437 | |
1456 | |
1438 | my $active = eval $v->{source}; |
1457 | my $active = eval $v->{source}; |
1439 | |
1458 | |
1440 | if (length $@) { |
1459 | if (length $@) { |
1441 | warn "$v->{path}: $@\n"; |
1460 | error "$v->{path}: $@\n"; |
1442 | |
1461 | |
1443 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1462 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1444 | if exists $v->{meta}{mandatory}; |
1463 | if exists $v->{meta}{mandatory}; |
1445 | |
1464 | |
1446 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
1465 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
… | |
… | |
1448 | } else { |
1467 | } else { |
1449 | $done{$k} = delete $todo{$k}; |
1468 | $done{$k} = delete $todo{$k}; |
1450 | push @EXTS, $v->{pkg}; |
1469 | push @EXTS, $v->{pkg}; |
1451 | $progress = 1; |
1470 | $progress = 1; |
1452 | |
1471 | |
1453 | warn "$v->{base}: extension inactive.\n" |
1472 | info "$v->{base}: extension inactive.\n" |
1454 | unless $active; |
1473 | unless $active; |
1455 | } |
1474 | } |
1456 | } |
1475 | } |
1457 | |
1476 | |
1458 | unless ($progress) { |
1477 | unless ($progress) { |
… | |
… | |
1630 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1649 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1631 | |
1650 | |
1632 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1651 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1633 | $pl->deactivate; |
1652 | $pl->deactivate; |
1634 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1653 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1635 | $pl->ob->check_score; |
|
|
1636 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1654 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1637 | $pl->ns->destroy if $pl->ns; |
1655 | $pl->ns->destroy if $pl->ns; |
1638 | |
1656 | |
1639 | my $path = playerdir $pl; |
1657 | my $path = playerdir $pl; |
1640 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1658 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
… | |
… | |
1695 | \@logins |
1713 | \@logins |
1696 | } |
1714 | } |
1697 | |
1715 | |
1698 | =item $player->maps |
1716 | =item $player->maps |
1699 | |
1717 | |
|
|
1718 | =item cf::player::maps $login |
|
|
1719 | |
1700 | Returns an arrayref of map paths that are private for this |
1720 | Returns an arrayref of map paths that are private for this |
1701 | player. May block. |
1721 | player. May block. |
1702 | |
1722 | |
1703 | =cut |
1723 | =cut |
1704 | |
1724 | |
… | |
… | |
1765 | |
1785 | |
1766 | =cut |
1786 | =cut |
1767 | |
1787 | |
1768 | sub find_by_path($) { |
1788 | sub find_by_path($) { |
1769 | my ($path) = @_; |
1789 | my ($path) = @_; |
|
|
1790 | |
|
|
1791 | $path =~ s/^~[^\/]*//; # skip ~login |
1770 | |
1792 | |
1771 | my ($match, $specificity); |
1793 | my ($match, $specificity); |
1772 | |
1794 | |
1773 | for my $region (list) { |
1795 | for my $region (list) { |
1774 | if ($region->{match} && $path =~ $region->{match}) { |
1796 | if ($region->{match} && $path =~ $region->{match}) { |
… | |
… | |
1831 | |
1853 | |
1832 | sub register { |
1854 | sub register { |
1833 | my (undef, $regex, $prio) = @_; |
1855 | my (undef, $regex, $prio) = @_; |
1834 | my $pkg = caller; |
1856 | my $pkg = caller; |
1835 | |
1857 | |
1836 | no strict; |
|
|
1837 | push @{"$pkg\::ISA"}, __PACKAGE__; |
1858 | push @{"$pkg\::ISA"}, __PACKAGE__; |
1838 | |
1859 | |
1839 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
1860 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
1840 | } |
1861 | } |
1841 | |
1862 | |
1842 | # also paths starting with '/' |
1863 | # also paths starting with '/' |
1843 | $EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; |
1864 | $EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}]; |
1844 | |
1865 | |
1845 | sub thawer_merge { |
1866 | sub thawer_merge { |
1846 | my ($self, $merge) = @_; |
1867 | my ($self, $merge) = @_; |
1847 | |
1868 | |
1848 | # we have to keep some variables in memory intact |
1869 | # we have to keep some variables in memory intact |
… | |
… | |
1853 | } |
1874 | } |
1854 | |
1875 | |
1855 | sub normalise { |
1876 | sub normalise { |
1856 | my ($path, $base) = @_; |
1877 | my ($path, $base) = @_; |
1857 | |
1878 | |
1858 | $path = "$path"; # make sure its a string |
1879 | $path = "$path"; # make sure it's a string |
1859 | |
1880 | |
1860 | $path =~ s/\.map$//; |
1881 | $path =~ s/\.map$//; |
1861 | |
1882 | |
1862 | # map plan: |
1883 | # map plan: |
1863 | # |
1884 | # |
… | |
… | |
1902 | $self->init; # pass $1 etc. |
1923 | $self->init; # pass $1 etc. |
1903 | return $self; |
1924 | return $self; |
1904 | } |
1925 | } |
1905 | } |
1926 | } |
1906 | |
1927 | |
1907 | Carp::cluck "unable to resolve path '$path' (base '$base')."; |
1928 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
1908 | () |
1929 | () |
1909 | } |
1930 | } |
1910 | |
1931 | |
1911 | sub init { |
1932 | sub init { |
1912 | my ($self) = @_; |
1933 | my ($self) = @_; |
… | |
… | |
2034 | } |
2055 | } |
2035 | |
2056 | |
2036 | sub find; |
2057 | sub find; |
2037 | sub find { |
2058 | sub find { |
2038 | my ($path, $origin) = @_; |
2059 | my ($path, $origin) = @_; |
|
|
2060 | |
|
|
2061 | cf::cede_to_tick; |
2039 | |
2062 | |
2040 | $path = normalise $path, $origin && $origin->path; |
2063 | $path = normalise $path, $origin && $origin->path; |
2041 | |
2064 | |
2042 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2065 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2043 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2066 | my $guard2 = cf::lock_acquire "map_find:$path"; |
… | |
… | |
2158 | or next; |
2181 | or next; |
2159 | $neigh = find $neigh, $map |
2182 | $neigh = find $neigh, $map |
2160 | or next; |
2183 | or next; |
2161 | $neigh->load; |
2184 | $neigh->load; |
2162 | |
2185 | |
|
|
2186 | # now find the diagonal neighbours |
2163 | push @neigh, |
2187 | push @neigh, |
2164 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
2188 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
2165 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
2189 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
2166 | } |
2190 | } |
2167 | |
2191 | |
… | |
… | |
2174 | } |
2198 | } |
2175 | |
2199 | |
2176 | sub find_sync { |
2200 | sub find_sync { |
2177 | my ($path, $origin) = @_; |
2201 | my ($path, $origin) = @_; |
2178 | |
2202 | |
2179 | cf::sync_job { find $path, $origin } |
2203 | return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" |
|
|
2204 | if $Coro::current == $Coro::main; |
|
|
2205 | |
|
|
2206 | find $path, $origin |
2180 | } |
2207 | } |
2181 | |
2208 | |
2182 | sub do_load_sync { |
2209 | sub do_load_sync { |
2183 | my ($map) = @_; |
2210 | my ($map) = @_; |
2184 | |
2211 | |
2185 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
2212 | return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" |
2186 | if $Coro::current == $Coro::main; |
2213 | if $Coro::current == $Coro::main; |
2187 | |
2214 | |
2188 | cf::sync_job { $map->load }; |
2215 | $map->load; |
2189 | } |
2216 | } |
2190 | |
2217 | |
2191 | our %MAP_PREFETCH; |
2218 | our %MAP_PREFETCH; |
2192 | our $MAP_PREFETCHER = undef; |
2219 | our $MAP_PREFETCHER = undef; |
2193 | |
2220 | |
… | |
… | |
2305 | |
2332 | |
2306 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2333 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2307 | |
2334 | |
2308 | return if $self->players; |
2335 | return if $self->players; |
2309 | |
2336 | |
2310 | warn "resetting map ", $self->path, "\n"; |
2337 | cf::trace "resetting map ", $self->path, "\n"; |
2311 | |
2338 | |
2312 | $self->in_memory (cf::MAP_SWAPPED); |
2339 | $self->in_memory (cf::MAP_SWAPPED); |
2313 | |
2340 | |
2314 | # need to save uniques path |
2341 | # need to save uniques path |
2315 | unless ($self->{deny_save}) { |
2342 | unless ($self->{deny_save}) { |
… | |
… | |
2339 | |
2366 | |
2340 | delete $cf::MAP{$self->path}; |
2367 | delete $cf::MAP{$self->path}; |
2341 | |
2368 | |
2342 | $self->unlink_save; |
2369 | $self->unlink_save; |
2343 | |
2370 | |
2344 | bless $self, "cf::map"; |
2371 | bless $self, "cf::map::wrap"; |
2345 | delete $self->{deny_reset}; |
2372 | delete $self->{deny_reset}; |
2346 | $self->{deny_save} = 1; |
2373 | $self->{deny_save} = 1; |
2347 | $self->reset_timeout (1); |
2374 | $self->reset_timeout (1); |
2348 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2375 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2349 | |
2376 | |
… | |
… | |
2579 | |
2606 | |
2580 | Freezes the player and moves him/her to a special map (C<{link}>). |
2607 | Freezes the player and moves him/her to a special map (C<{link}>). |
2581 | |
2608 | |
2582 | The player should be reasonably safe there for short amounts of time (e.g. |
2609 | The player should be reasonably safe there for short amounts of time (e.g. |
2583 | for loading a map). You I<MUST> call C<leave_link> as soon as possible, |
2610 | for loading a map). You I<MUST> call C<leave_link> as soon as possible, |
2584 | though, as the palyer cannot control the character while it is on the link |
2611 | though, as the player cannot control the character while it is on the link |
2585 | map. |
2612 | map. |
2586 | |
2613 | |
2587 | Will never block. |
2614 | Will never block. |
2588 | |
2615 | |
2589 | =item $player_object->leave_link ($map, $x, $y) |
2616 | =item $player_object->leave_link ($map, $x, $y) |
… | |
… | |
2610 | sub cf::object::player::enter_link { |
2637 | sub cf::object::player::enter_link { |
2611 | my ($self) = @_; |
2638 | my ($self) = @_; |
2612 | |
2639 | |
2613 | $self->deactivate_recursive; |
2640 | $self->deactivate_recursive; |
2614 | |
2641 | |
|
|
2642 | ++$self->{_link_recursion}; |
|
|
2643 | |
2615 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
2644 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
2616 | |
2645 | |
2617 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
2646 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
2618 | if $self->map && $self->map->{path} ne "{link}"; |
2647 | if $self->map && $self->map->{path} ne "{link}"; |
2619 | |
2648 | |
… | |
… | |
2650 | $map->load_neighbours; |
2679 | $map->load_neighbours; |
2651 | |
2680 | |
2652 | return unless $self->contr->active; |
2681 | return unless $self->contr->active; |
2653 | |
2682 | |
2654 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2683 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2655 | $self->enter_map ($map, $x, $y); |
2684 | if ($self->enter_map ($map, $x, $y)) { |
2656 | |
2685 | # entering was successful |
|
|
2686 | delete $self->{_link_recursion}; |
2657 | # only activate afterwards, to support waiting in hooks |
2687 | # only activate afterwards, to support waiting in hooks |
2658 | $self->activate_recursive; |
2688 | $self->activate_recursive; |
2659 | } |
2689 | } |
2660 | |
2690 | |
|
|
2691 | } |
|
|
2692 | |
2661 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
2693 | =item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]]) |
2662 | |
2694 | |
2663 | Moves the player to the given map-path and coordinates by first freezing |
2695 | Moves the player to the given map-path and coordinates by first freezing |
2664 | her, loading and preparing them map, calling the provided $check callback |
2696 | her, loading and preparing them map, calling the provided $check callback |
2665 | that has to return the map if sucecssful, and then unfreezes the player on |
2697 | that has to return the map if sucecssful, and then unfreezes the player on |
2666 | the new (success) or old (failed) map position. In either case, $done will |
2698 | the new (success) or old (failed) map position. In either case, $done will |
… | |
… | |
2673 | |
2705 | |
2674 | our $GOTOGEN; |
2706 | our $GOTOGEN; |
2675 | |
2707 | |
2676 | sub cf::object::player::goto { |
2708 | sub cf::object::player::goto { |
2677 | my ($self, $path, $x, $y, $check, $done) = @_; |
2709 | my ($self, $path, $x, $y, $check, $done) = @_; |
|
|
2710 | |
|
|
2711 | if ($self->{_link_recursion} >= $MAX_LINKS) { |
|
|
2712 | error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; |
|
|
2713 | $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); |
|
|
2714 | ($path, $x, $y) = @$EMERGENCY_POSITION; |
|
|
2715 | } |
2678 | |
2716 | |
2679 | # do generation counting so two concurrent goto's will be executed in-order |
2717 | # do generation counting so two concurrent goto's will be executed in-order |
2680 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2718 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2681 | |
2719 | |
2682 | $self->enter_link; |
2720 | $self->enter_link; |
… | |
… | |
2706 | my $map = eval { |
2744 | my $map = eval { |
2707 | my $map = defined $path ? cf::map::find $path : undef; |
2745 | my $map = defined $path ? cf::map::find $path : undef; |
2708 | |
2746 | |
2709 | if ($map) { |
2747 | if ($map) { |
2710 | $map = $map->customise_for ($self); |
2748 | $map = $map->customise_for ($self); |
2711 | $map = $check->($map) if $check && $map; |
2749 | $map = $check->($map, $x, $y, $self) if $check && $map; |
2712 | } else { |
2750 | } else { |
2713 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2751 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2714 | } |
2752 | } |
2715 | |
2753 | |
2716 | $map |
2754 | $map |
… | |
… | |
2724 | if ($gen == $self->{_goto_generation}) { |
2762 | if ($gen == $self->{_goto_generation}) { |
2725 | delete $self->{_goto_generation}; |
2763 | delete $self->{_goto_generation}; |
2726 | $self->leave_link ($map, $x, $y); |
2764 | $self->leave_link ($map, $x, $y); |
2727 | } |
2765 | } |
2728 | |
2766 | |
2729 | $done->() if $done; |
2767 | $done->($self) if $done; |
2730 | })->prio (1); |
2768 | })->prio (1); |
2731 | } |
2769 | } |
2732 | |
2770 | |
2733 | =item $player_object->enter_exit ($exit_object) |
2771 | =item $player_object->enter_exit ($exit_object) |
2734 | |
2772 | |
… | |
… | |
2827 | $self->message ("Something went wrong deep within the deliantra server. " |
2865 | $self->message ("Something went wrong deep within the deliantra server. " |
2828 | . "I'll try to bring you back to the map you were before. " |
2866 | . "I'll try to bring you back to the map you were before. " |
2829 | . "Please report this to the dungeon master!", |
2867 | . "Please report this to the dungeon master!", |
2830 | cf::NDI_UNIQUE | cf::NDI_RED); |
2868 | cf::NDI_UNIQUE | cf::NDI_RED); |
2831 | |
2869 | |
2832 | warn "ERROR in enter_exit: $@"; |
2870 | error "ERROR in enter_exit: $@"; |
2833 | $self->leave_link; |
2871 | $self->leave_link; |
2834 | } |
2872 | } |
2835 | })->prio (1); |
2873 | })->prio (1); |
2836 | } |
2874 | } |
2837 | |
2875 | |
… | |
… | |
3150 | |
3188 | |
3151 | $ns->ext_reply ($reply, @reply) |
3189 | $ns->ext_reply ($reply, @reply) |
3152 | if $reply; |
3190 | if $reply; |
3153 | |
3191 | |
3154 | } else { |
3192 | } else { |
3155 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3193 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3156 | } |
3194 | } |
3157 | |
3195 | |
3158 | cf::override; |
3196 | cf::override; |
3159 | }, |
3197 | }, |
3160 | ); |
3198 | ); |
… | |
… | |
3241 | decrease split destroy change_exp value msg lore send_msg)], |
3279 | decrease split destroy change_exp value msg lore send_msg)], |
3242 | ["cf::object::player" => qw(player)], |
3280 | ["cf::object::player" => qw(player)], |
3243 | ["cf::player" => qw(peaceful send_msg)], |
3281 | ["cf::player" => qw(peaceful send_msg)], |
3244 | ["cf::map" => qw(trigger)], |
3282 | ["cf::map" => qw(trigger)], |
3245 | ) { |
3283 | ) { |
3246 | no strict 'refs'; |
|
|
3247 | my ($pkg, @funs) = @$_; |
3284 | my ($pkg, @funs) = @$_; |
3248 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
3285 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
3249 | for @funs; |
3286 | for @funs; |
3250 | } |
3287 | } |
3251 | |
3288 | |
… | |
… | |
3290 | local @cf::_safe_eval_args = values %vars; |
3327 | local @cf::_safe_eval_args = values %vars; |
3291 | @res = wantarray ? eval eval : scalar eval $eval; |
3328 | @res = wantarray ? eval eval : scalar eval $eval; |
3292 | } |
3329 | } |
3293 | |
3330 | |
3294 | if ($@) { |
3331 | if ($@) { |
3295 | warn "$@"; |
3332 | warn "$@", |
3296 | warn "while executing safe code '$code'\n"; |
3333 | "while executing safe code '$code'\n", |
3297 | warn "with arguments " . (join " ", %vars) . "\n"; |
3334 | "with arguments " . (join " ", %vars) . "\n"; |
3298 | } |
3335 | } |
3299 | |
3336 | |
3300 | wantarray ? @res : $res[0] |
3337 | wantarray ? @res : $res[0] |
3301 | } |
3338 | } |
3302 | |
3339 | |
… | |
… | |
3336 | # for this (global event?) |
3373 | # for this (global event?) |
3337 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3374 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3338 | |
3375 | |
3339 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3376 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3340 | |
3377 | |
3341 | warn "loading facedata from $path\n"; |
3378 | trace "loading facedata from $path\n"; |
3342 | |
3379 | |
3343 | my $facedata; |
|
|
3344 | 0 < aio_load $path, $facedata |
3380 | 0 < aio_load $path, my $facedata |
3345 | or die "$path: $!"; |
3381 | or die "$path: $!"; |
3346 | |
3382 | |
3347 | $facedata = Coro::Storable::thaw $facedata; |
3383 | $facedata = Coro::Storable::thaw $facedata; |
3348 | |
3384 | |
3349 | $facedata->{version} == 2 |
3385 | $facedata->{version} == 2 |
… | |
… | |
3380 | |
3416 | |
3381 | if (my $smooth = cf::face::find $info->{smooth}) { |
3417 | if (my $smooth = cf::face::find $info->{smooth}) { |
3382 | cf::face::set_smooth $idx, $smooth; |
3418 | cf::face::set_smooth $idx, $smooth; |
3383 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3419 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3384 | } else { |
3420 | } else { |
3385 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
3421 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3386 | } |
3422 | } |
3387 | |
3423 | |
3388 | cf::cede_to_tick; |
3424 | cf::cede_to_tick; |
3389 | } |
3425 | } |
3390 | } |
3426 | } |
… | |
… | |
3408 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3444 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3409 | |
3445 | |
3410 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3446 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3411 | cf::face::set_type $idx, $info->{type}; |
3447 | cf::face::set_type $idx, $info->{type}; |
3412 | } else { |
3448 | } else { |
3413 | $RESOURCE{$name} = $info; |
3449 | $RESOURCE{$name} = $info; # unused |
3414 | } |
3450 | } |
3415 | |
3451 | |
3416 | cf::cede_to_tick; |
3452 | cf::cede_to_tick; |
3417 | } |
3453 | } |
3418 | } |
3454 | } |
3419 | |
3455 | |
3420 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3456 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3421 | |
3457 | |
3422 | 1 |
3458 | 1 |
3423 | } |
3459 | } |
3424 | |
|
|
3425 | cf::global->attach (on_resource_update => sub { |
|
|
3426 | if (my $soundconf = $RESOURCE{"res/sound.conf"}) { |
|
|
3427 | $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data}); |
|
|
3428 | |
|
|
3429 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
3430 | my $sound = $soundconf->{compat}[$_] |
|
|
3431 | or next; |
|
|
3432 | |
|
|
3433 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
3434 | cf::sound::set $sound->[0] => $face; |
|
|
3435 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
3436 | } |
|
|
3437 | |
|
|
3438 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
3439 | my $face = cf::face::find "sound/$v"; |
|
|
3440 | cf::sound::set $k => $face; |
|
|
3441 | } |
|
|
3442 | } |
|
|
3443 | }); |
|
|
3444 | |
3460 | |
3445 | register_exticmd fx_want => sub { |
3461 | register_exticmd fx_want => sub { |
3446 | my ($ns, $want) = @_; |
3462 | my ($ns, $want) = @_; |
3447 | |
3463 | |
3448 | while (my ($k, $v) = each %$want) { |
3464 | while (my ($k, $v) = each %$want) { |
… | |
… | |
3487 | sub reload_treasures { |
3503 | sub reload_treasures { |
3488 | load_resource_file "$DATADIR/treasures" |
3504 | load_resource_file "$DATADIR/treasures" |
3489 | or die "unable to load treasurelists\n"; |
3505 | or die "unable to load treasurelists\n"; |
3490 | } |
3506 | } |
3491 | |
3507 | |
|
|
3508 | sub reload_sound { |
|
|
3509 | trace "loading sound config from $DATADIR/sound\n"; |
|
|
3510 | |
|
|
3511 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
|
|
3512 | or die "$DATADIR/sound $!"; |
|
|
3513 | |
|
|
3514 | my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); |
|
|
3515 | |
|
|
3516 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
3517 | my $sound = $soundconf->{compat}[$_] |
|
|
3518 | or next; |
|
|
3519 | |
|
|
3520 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
3521 | cf::sound::set $sound->[0] => $face; |
|
|
3522 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
3523 | } |
|
|
3524 | |
|
|
3525 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
3526 | my $face = cf::face::find "sound/$v"; |
|
|
3527 | cf::sound::set $k => $face; |
|
|
3528 | } |
|
|
3529 | } |
|
|
3530 | |
3492 | sub reload_resources { |
3531 | sub reload_resources { |
3493 | warn "reloading resource files...\n"; |
3532 | trace "reloading resource files...\n"; |
3494 | |
3533 | |
|
|
3534 | reload_exp_table; |
|
|
3535 | reload_materials; |
3495 | reload_facedata; |
3536 | reload_facedata; |
|
|
3537 | reload_sound; |
3496 | reload_archetypes; |
3538 | reload_archetypes; |
3497 | reload_regions; |
3539 | reload_regions; |
3498 | reload_treasures; |
3540 | reload_treasures; |
3499 | |
3541 | |
3500 | warn "finished reloading resource files\n"; |
3542 | trace "finished reloading resource files\n"; |
3501 | } |
3543 | } |
3502 | |
3544 | |
3503 | sub reload_config { |
3545 | sub reload_config { |
3504 | warn "reloading config file...\n"; |
3546 | trace "reloading config file...\n"; |
3505 | |
3547 | |
3506 | open my $fh, "<:utf8", "$CONFDIR/config" |
3548 | 0 < aio_load "$CONFDIR/config", my $config |
3507 | or return; |
3549 | or die "$CONFDIR/config: $!"; |
3508 | |
3550 | |
3509 | local $/; |
3551 | utf8::decode $config; |
|
|
3552 | |
|
|
3553 | cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow... |
3510 | *CFG = YAML::XS::Load scalar <$fh>; |
3554 | *CFG = YAML::XS::Load $config; |
3511 | |
3555 | |
3512 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; |
3556 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3513 | |
3557 | |
3514 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3558 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3515 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3559 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3516 | |
3560 | |
3517 | if (exists $CFG{mlockall}) { |
3561 | if (exists $CFG{mlockall}) { |
… | |
… | |
3519 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3563 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3520 | and die "WARNING: m(un)lockall failed: $!\n"; |
3564 | and die "WARNING: m(un)lockall failed: $!\n"; |
3521 | }; |
3565 | }; |
3522 | warn $@ if $@; |
3566 | warn $@ if $@; |
3523 | } |
3567 | } |
3524 | |
|
|
3525 | warn "finished reloading resource files\n"; |
|
|
3526 | } |
3568 | } |
3527 | |
3569 | |
3528 | sub pidfile() { |
3570 | sub pidfile() { |
3529 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3571 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3530 | or die "$PIDFILE: $!"; |
3572 | or die "$PIDFILE: $!"; |
… | |
… | |
3543 | seek $fh, 0, 0; |
3585 | seek $fh, 0, 0; |
3544 | print $fh $$; |
3586 | print $fh $$; |
3545 | } |
3587 | } |
3546 | |
3588 | |
3547 | sub main_loop { |
3589 | sub main_loop { |
3548 | warn "EV::loop starting\n"; |
3590 | trace "EV::loop starting\n"; |
3549 | if (1) { |
3591 | if (1) { |
3550 | EV::loop; |
3592 | EV::loop; |
3551 | } |
3593 | } |
3552 | warn "EV::loop returned\n"; |
3594 | trace "EV::loop returned\n"; |
3553 | goto &main_loop unless $REALLY_UNLOOP; |
3595 | goto &main_loop unless $REALLY_UNLOOP; |
3554 | } |
3596 | } |
3555 | |
3597 | |
3556 | sub main { |
3598 | sub main { |
3557 | cf::init_globals; # initialise logging |
3599 | cf::init_globals; # initialise logging |
3558 | |
3600 | |
3559 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3601 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3560 | LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3602 | LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3561 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3603 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3562 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3604 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3563 | |
3605 | |
3564 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3606 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3565 | |
3607 | |
… | |
… | |
3573 | }; |
3615 | }; |
3574 | |
3616 | |
3575 | evthread_start IO::AIO::poll_fileno; |
3617 | evthread_start IO::AIO::poll_fileno; |
3576 | |
3618 | |
3577 | cf::sync_job { |
3619 | cf::sync_job { |
3578 | cf::init_experience; |
3620 | cf::incloader::init (); |
|
|
3621 | |
3579 | cf::init_anim; |
3622 | cf::init_anim; |
3580 | cf::init_attackmess; |
3623 | cf::init_attackmess; |
3581 | cf::init_dynamic; |
3624 | cf::init_dynamic; |
3582 | |
3625 | |
3583 | cf::load_settings; |
3626 | cf::load_settings; |
3584 | cf::load_materials; |
|
|
3585 | |
3627 | |
3586 | reload_resources; |
3628 | reload_resources; |
3587 | reload_config; |
3629 | reload_config; |
3588 | db_init; |
3630 | db_init; |
3589 | |
3631 | |
… | |
… | |
3605 | |
3647 | |
3606 | (pop @POST_INIT)->(0) while @POST_INIT; |
3648 | (pop @POST_INIT)->(0) while @POST_INIT; |
3607 | }; |
3649 | }; |
3608 | |
3650 | |
3609 | cf::object::thawer::errors_are_fatal 0; |
3651 | cf::object::thawer::errors_are_fatal 0; |
3610 | warn "parse errors in files are no longer fatal from this point on.\n"; |
3652 | info "parse errors in files are no longer fatal from this point on.\n"; |
3611 | |
3653 | |
|
|
3654 | my $free_main; $free_main = EV::idle sub { |
|
|
3655 | undef $free_main; |
|
|
3656 | undef &main; # free gobs of memory :) |
|
|
3657 | }; |
|
|
3658 | |
3612 | main_loop; |
3659 | goto &main_loop; |
3613 | } |
3660 | } |
3614 | |
3661 | |
3615 | ############################################################################# |
3662 | ############################################################################# |
3616 | # initialisation and cleanup |
3663 | # initialisation and cleanup |
3617 | |
3664 | |
… | |
… | |
3656 | or return; |
3703 | or return; |
3657 | |
3704 | |
3658 | aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE |
3705 | aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE |
3659 | and return; |
3706 | and return; |
3660 | |
3707 | |
3661 | warn sprintf "runtime file written (%gs).\n", AE::time - $t0; |
3708 | trace sprintf "runtime file written (%gs).\n", AE::time - $t0; |
3662 | |
3709 | |
3663 | 1 |
3710 | 1 |
3664 | } |
3711 | } |
3665 | |
3712 | |
3666 | our $uuid_lock; |
3713 | our $uuid_lock; |
… | |
… | |
3678 | or return; |
3725 | or return; |
3679 | |
3726 | |
3680 | my $value = uuid_seq uuid_cur; |
3727 | my $value = uuid_seq uuid_cur; |
3681 | |
3728 | |
3682 | unless ($value) { |
3729 | unless ($value) { |
3683 | warn "cowardly refusing to write zero uuid value!\n"; |
3730 | info "cowardly refusing to write zero uuid value!\n"; |
3684 | return; |
3731 | return; |
3685 | } |
3732 | } |
3686 | |
3733 | |
3687 | my $value = uuid_str $value + $uuid_skip; |
3734 | my $value = uuid_str $value + $uuid_skip; |
3688 | $uuid_skip = 0; |
3735 | $uuid_skip = 0; |
… | |
… | |
3698 | or return; |
3745 | or return; |
3699 | |
3746 | |
3700 | aio_rename "$uuid~", $uuid |
3747 | aio_rename "$uuid~", $uuid |
3701 | and return; |
3748 | and return; |
3702 | |
3749 | |
3703 | warn "uuid file written ($value).\n"; |
3750 | trace "uuid file written ($value).\n"; |
3704 | |
3751 | |
3705 | 1 |
3752 | 1 |
3706 | |
3753 | |
3707 | } |
3754 | } |
3708 | |
3755 | |
… | |
… | |
3714 | } |
3761 | } |
3715 | |
3762 | |
3716 | sub emergency_save() { |
3763 | sub emergency_save() { |
3717 | my $freeze_guard = cf::freeze_mainloop; |
3764 | my $freeze_guard = cf::freeze_mainloop; |
3718 | |
3765 | |
3719 | warn "emergency_perl_save: enter\n"; |
3766 | info "emergency_perl_save: enter\n"; |
|
|
3767 | |
|
|
3768 | # this is a trade-off: we want to be very quick here, so |
|
|
3769 | # save all maps without fsync, and later call a global sync |
|
|
3770 | # (which in turn might be very very slow) |
|
|
3771 | local $USE_FSYNC = 0; |
3720 | |
3772 | |
3721 | cf::sync_job { |
3773 | cf::sync_job { |
3722 | # this is a trade-off: we want to be very quick here, so |
3774 | cf::write_runtime_sync; # external watchdog should not bark |
3723 | # save all maps without fsync, and later call a global sync |
|
|
3724 | # (which in turn might be very very slow) |
|
|
3725 | local $USE_FSYNC = 0; |
|
|
3726 | |
3775 | |
3727 | # use a peculiar iteration method to avoid tripping on perl |
3776 | # use a peculiar iteration method to avoid tripping on perl |
3728 | # refcount bugs in for. also avoids problems with players |
3777 | # refcount bugs in for. also avoids problems with players |
3729 | # and maps saved/destroyed asynchronously. |
3778 | # and maps saved/destroyed asynchronously. |
3730 | warn "emergency_perl_save: begin player save\n"; |
3779 | info "emergency_perl_save: begin player save\n"; |
3731 | for my $login (keys %cf::PLAYER) { |
3780 | for my $login (keys %cf::PLAYER) { |
3732 | my $pl = $cf::PLAYER{$login} or next; |
3781 | my $pl = $cf::PLAYER{$login} or next; |
3733 | $pl->valid or next; |
3782 | $pl->valid or next; |
3734 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3783 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3735 | $pl->save; |
3784 | $pl->save; |
3736 | } |
3785 | } |
3737 | warn "emergency_perl_save: end player save\n"; |
3786 | info "emergency_perl_save: end player save\n"; |
3738 | |
3787 | |
|
|
3788 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3789 | |
3739 | warn "emergency_perl_save: begin map save\n"; |
3790 | info "emergency_perl_save: begin map save\n"; |
3740 | for my $path (keys %cf::MAP) { |
3791 | for my $path (keys %cf::MAP) { |
3741 | my $map = $cf::MAP{$path} or next; |
3792 | my $map = $cf::MAP{$path} or next; |
3742 | $map->valid or next; |
3793 | $map->valid or next; |
3743 | $map->save; |
3794 | $map->save; |
3744 | } |
3795 | } |
3745 | warn "emergency_perl_save: end map save\n"; |
3796 | info "emergency_perl_save: end map save\n"; |
3746 | |
3797 | |
|
|
3798 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3799 | |
3747 | warn "emergency_perl_save: begin database checkpoint\n"; |
3800 | info "emergency_perl_save: begin database checkpoint\n"; |
3748 | BDB::db_env_txn_checkpoint $DB_ENV; |
3801 | BDB::db_env_txn_checkpoint $DB_ENV; |
3749 | warn "emergency_perl_save: end database checkpoint\n"; |
3802 | info "emergency_perl_save: end database checkpoint\n"; |
3750 | |
3803 | |
3751 | warn "emergency_perl_save: begin write uuid\n"; |
3804 | info "emergency_perl_save: begin write uuid\n"; |
3752 | write_uuid_sync 1; |
3805 | write_uuid_sync 1; |
3753 | warn "emergency_perl_save: end write uuid\n"; |
3806 | info "emergency_perl_save: end write uuid\n"; |
|
|
3807 | |
|
|
3808 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3809 | |
|
|
3810 | trace "emergency_perl_save: syncing database to disk"; |
|
|
3811 | BDB::db_env_txn_checkpoint $DB_ENV; |
|
|
3812 | |
|
|
3813 | info "emergency_perl_save: starting sync\n"; |
|
|
3814 | IO::AIO::aio_sync sub { |
|
|
3815 | info "emergency_perl_save: finished sync\n"; |
|
|
3816 | }; |
|
|
3817 | |
|
|
3818 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3819 | |
|
|
3820 | trace "emergency_perl_save: flushing outstanding aio requests"; |
|
|
3821 | while (IO::AIO::nreqs || BDB::nreqs) { |
|
|
3822 | Coro::EV::timer_once 0.01; # let the sync_job do it's thing |
|
|
3823 | } |
|
|
3824 | |
|
|
3825 | cf::write_runtime_sync; # external watchdog should not bark |
3754 | }; |
3826 | }; |
3755 | |
3827 | |
3756 | warn "emergency_perl_save: starting sync()\n"; |
|
|
3757 | IO::AIO::aio_sync sub { |
|
|
3758 | warn "emergency_perl_save: finished sync()\n"; |
|
|
3759 | }; |
|
|
3760 | |
|
|
3761 | warn "emergency_perl_save: leave\n"; |
3828 | info "emergency_perl_save: leave\n"; |
3762 | } |
3829 | } |
3763 | |
3830 | |
3764 | sub post_cleanup { |
3831 | sub post_cleanup { |
3765 | my ($make_core) = @_; |
3832 | my ($make_core) = @_; |
3766 | |
3833 | |
|
|
3834 | IO::AIO::flush; |
|
|
3835 | |
3767 | warn Carp::longmess "post_cleanup backtrace" |
3836 | error Carp::longmess "post_cleanup backtrace" |
3768 | if $make_core; |
3837 | if $make_core; |
3769 | |
3838 | |
3770 | my $fh = pidfile; |
3839 | my $fh = pidfile; |
3771 | unlink $PIDFILE if <$fh> == $$; |
3840 | unlink $PIDFILE if <$fh> == $$; |
3772 | } |
3841 | } |
… | |
… | |
3796 | } |
3865 | } |
3797 | } |
3866 | } |
3798 | |
3867 | |
3799 | sub do_reload_perl() { |
3868 | sub do_reload_perl() { |
3800 | # can/must only be called in main |
3869 | # can/must only be called in main |
3801 | if (in_main) { |
3870 | unless (in_main) { |
3802 | warn "can only reload from main coroutine"; |
3871 | error "can only reload from main coroutine"; |
3803 | return; |
3872 | return; |
3804 | } |
3873 | } |
3805 | |
3874 | |
3806 | return if $RELOAD++; |
3875 | return if $RELOAD++; |
3807 | |
3876 | |
3808 | my $t1 = AE::time; |
3877 | my $t1 = AE::time; |
3809 | |
3878 | |
3810 | while ($RELOAD) { |
3879 | while ($RELOAD) { |
|
|
3880 | cf::get_slot 0.1, -1, "reload_perl"; |
3811 | warn "reloading..."; |
3881 | info "reloading..."; |
3812 | |
3882 | |
3813 | warn "entering sync_job"; |
3883 | trace "entering sync_job"; |
3814 | |
3884 | |
3815 | cf::sync_job { |
3885 | cf::sync_job { |
3816 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3817 | cf::emergency_save; |
3886 | #cf::emergency_save; |
3818 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3819 | |
3887 | |
3820 | warn "syncing database to disk"; |
|
|
3821 | BDB::db_env_txn_checkpoint $DB_ENV; |
|
|
3822 | |
|
|
3823 | # if anything goes wrong in here, we should simply crash as we already saved |
|
|
3824 | |
|
|
3825 | warn "flushing outstanding aio requests"; |
|
|
3826 | while (IO::AIO::nreqs || BDB::nreqs) { |
|
|
3827 | Coro::EV::timer_once 0.01; # let the sync_job do it's thing |
|
|
3828 | } |
|
|
3829 | |
|
|
3830 | warn "cancelling all extension coros"; |
3888 | trace "cancelling all extension coros"; |
3831 | $_->cancel for values %EXT_CORO; |
3889 | $_->cancel for values %EXT_CORO; |
3832 | %EXT_CORO = (); |
3890 | %EXT_CORO = (); |
3833 | |
3891 | |
3834 | warn "removing commands"; |
3892 | trace "removing commands"; |
3835 | %COMMAND = (); |
3893 | %COMMAND = (); |
3836 | |
3894 | |
3837 | warn "removing ext/exti commands"; |
3895 | trace "removing ext/exti commands"; |
3838 | %EXTCMD = (); |
3896 | %EXTCMD = (); |
3839 | %EXTICMD = (); |
3897 | %EXTICMD = (); |
3840 | |
3898 | |
3841 | warn "unloading/nuking all extensions"; |
3899 | trace "unloading/nuking all extensions"; |
3842 | for my $pkg (@EXTS) { |
3900 | for my $pkg (@EXTS) { |
3843 | warn "... unloading $pkg"; |
3901 | trace "... unloading $pkg"; |
3844 | |
3902 | |
3845 | if (my $cb = $pkg->can ("unload")) { |
3903 | if (my $cb = $pkg->can ("unload")) { |
3846 | eval { |
3904 | eval { |
3847 | $cb->($pkg); |
3905 | $cb->($pkg); |
3848 | 1 |
3906 | 1 |
3849 | } or warn "$pkg unloaded, but with errors: $@"; |
3907 | } or error "$pkg unloaded, but with errors: $@"; |
3850 | } |
3908 | } |
3851 | |
3909 | |
3852 | warn "... clearing $pkg"; |
3910 | trace "... clearing $pkg"; |
3853 | clear_package $pkg; |
3911 | clear_package $pkg; |
3854 | } |
3912 | } |
3855 | |
3913 | |
3856 | warn "unloading all perl modules loaded from $LIBDIR"; |
3914 | trace "unloading all perl modules loaded from $LIBDIR"; |
3857 | while (my ($k, $v) = each %INC) { |
3915 | while (my ($k, $v) = each %INC) { |
3858 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3916 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3859 | |
3917 | |
3860 | warn "... unloading $k"; |
3918 | trace "... unloading $k"; |
3861 | delete $INC{$k}; |
3919 | delete $INC{$k}; |
3862 | |
3920 | |
3863 | $k =~ s/\.pm$//; |
3921 | $k =~ s/\.pm$//; |
3864 | $k =~ s/\//::/g; |
3922 | $k =~ s/\//::/g; |
3865 | |
3923 | |
… | |
… | |
3868 | } |
3926 | } |
3869 | |
3927 | |
3870 | clear_package $k; |
3928 | clear_package $k; |
3871 | } |
3929 | } |
3872 | |
3930 | |
3873 | warn "getting rid of safe::, as good as possible"; |
3931 | trace "getting rid of safe::, as good as possible"; |
3874 | clear_package "safe::$_" |
3932 | clear_package "safe::$_" |
3875 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3933 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3876 | |
3934 | |
3877 | warn "unloading cf.pm \"a bit\""; |
3935 | trace "unloading cf.pm \"a bit\""; |
3878 | delete $INC{"cf.pm"}; |
3936 | delete $INC{"cf.pm"}; |
3879 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3937 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3880 | |
3938 | |
3881 | # don't, removes xs symbols, too, |
3939 | # don't, removes xs symbols, too, |
3882 | # and global variables created in xs |
3940 | # and global variables created in xs |
3883 | #clear_package __PACKAGE__; |
3941 | #clear_package __PACKAGE__; |
3884 | |
3942 | |
3885 | warn "unload completed, starting to reload now"; |
3943 | info "unload completed, starting to reload now"; |
3886 | |
3944 | |
3887 | warn "reloading cf.pm"; |
3945 | trace "reloading cf.pm"; |
3888 | require cf; |
3946 | require cf; |
3889 | cf::_connect_to_perl_1; |
3947 | cf::_connect_to_perl_1; |
3890 | |
3948 | |
3891 | warn "loading config and database again"; |
3949 | trace "loading config and database again"; |
3892 | cf::reload_config; |
3950 | cf::reload_config; |
3893 | |
3951 | |
3894 | warn "loading extensions"; |
3952 | trace "loading extensions"; |
3895 | cf::load_extensions; |
3953 | cf::load_extensions; |
3896 | |
3954 | |
3897 | if ($REATTACH_ON_RELOAD) { |
3955 | if ($REATTACH_ON_RELOAD) { |
3898 | warn "reattaching attachments to objects/players"; |
3956 | trace "reattaching attachments to objects/players"; |
3899 | _global_reattach; # objects, sockets |
3957 | _global_reattach; # objects, sockets |
3900 | warn "reattaching attachments to maps"; |
3958 | trace "reattaching attachments to maps"; |
3901 | reattach $_ for values %MAP; |
3959 | reattach $_ for values %MAP; |
3902 | warn "reattaching attachments to players"; |
3960 | trace "reattaching attachments to players"; |
3903 | reattach $_ for values %PLAYER; |
3961 | reattach $_ for values %PLAYER; |
3904 | } |
3962 | } |
3905 | |
3963 | |
3906 | warn "running post_init jobs"; |
3964 | trace "running post_init jobs"; |
3907 | (pop @POST_INIT)->(1) while @POST_INIT; |
3965 | (pop @POST_INIT)->(1) while @POST_INIT; |
3908 | |
3966 | |
3909 | warn "leaving sync_job"; |
3967 | trace "leaving sync_job"; |
3910 | |
3968 | |
3911 | 1 |
3969 | 1 |
3912 | } or do { |
3970 | } or do { |
3913 | warn $@; |
3971 | error $@; |
3914 | cf::cleanup "error while reloading, exiting."; |
3972 | cf::cleanup "error while reloading, exiting."; |
3915 | }; |
3973 | }; |
3916 | |
3974 | |
3917 | warn "reloaded"; |
3975 | info "reloaded"; |
3918 | --$RELOAD; |
3976 | --$RELOAD; |
3919 | } |
3977 | } |
3920 | |
3978 | |
3921 | $t1 = AE::time - $t1; |
3979 | $t1 = AE::time - $t1; |
3922 | warn "reload completed in ${t1}s\n"; |
3980 | info "reload completed in ${t1}s\n"; |
3923 | }; |
3981 | }; |
3924 | |
3982 | |
3925 | our $RELOAD_WATCHER; # used only during reload |
3983 | our $RELOAD_WATCHER; # used only during reload |
3926 | |
3984 | |
3927 | sub reload_perl() { |
3985 | sub reload_perl() { |
… | |
… | |
3948 | reload_perl; |
4006 | reload_perl; |
3949 | }; |
4007 | }; |
3950 | } |
4008 | } |
3951 | }; |
4009 | }; |
3952 | |
4010 | |
3953 | unshift @INC, $LIBDIR; |
4011 | ############################################################################# |
3954 | |
4012 | |
3955 | my $bug_warning = 0; |
4013 | my $bug_warning = 0; |
3956 | |
4014 | |
3957 | our @WAIT_FOR_TICK; |
4015 | our @WAIT_FOR_TICK; |
3958 | our @WAIT_FOR_TICK_BEGIN; |
4016 | our @WAIT_FOR_TICK_BEGIN; |
3959 | |
4017 | |
3960 | sub wait_for_tick { |
4018 | sub wait_for_tick() { |
3961 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4019 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
3962 | |
4020 | |
3963 | my $signal = new Coro::Signal; |
4021 | my $signal = new Coro::Signal; |
3964 | push @WAIT_FOR_TICK, $signal; |
4022 | push @WAIT_FOR_TICK, $signal; |
3965 | $signal->wait; |
4023 | $signal->wait; |
3966 | } |
4024 | } |
3967 | |
4025 | |
3968 | sub wait_for_tick_begin { |
4026 | sub wait_for_tick_begin() { |
3969 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4027 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
3970 | |
4028 | |
3971 | my $signal = new Coro::Signal; |
4029 | my $signal = new Coro::Signal; |
3972 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4030 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3973 | $signal->wait; |
4031 | $signal->wait; |
… | |
… | |
3987 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
4045 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3988 | $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; |
4046 | $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; |
3989 | Coro::async_pool { |
4047 | Coro::async_pool { |
3990 | $Coro::current->{desc} = "runtime saver"; |
4048 | $Coro::current->{desc} = "runtime saver"; |
3991 | write_runtime_sync |
4049 | write_runtime_sync |
3992 | or warn "ERROR: unable to write runtime file: $!"; |
4050 | or error "ERROR: unable to write runtime file: $!"; |
3993 | }; |
4051 | }; |
3994 | } |
4052 | } |
3995 | |
4053 | |
3996 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
4054 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3997 | $sig->send; |
4055 | $sig->send; |
… | |
… | |
4005 | |
4063 | |
4006 | if (0) { |
4064 | if (0) { |
4007 | if ($NEXT_TICK) { |
4065 | if ($NEXT_TICK) { |
4008 | my $jitter = $TICK_START - $NEXT_TICK; |
4066 | my $jitter = $TICK_START - $NEXT_TICK; |
4009 | $JITTER = $JITTER * 0.75 + $jitter * 0.25; |
4067 | $JITTER = $JITTER * 0.75 + $jitter * 0.25; |
4010 | warn "jitter $JITTER\n";#d# |
4068 | debug "jitter $JITTER\n";#d# |
4011 | } |
4069 | } |
4012 | } |
4070 | } |
4013 | } |
4071 | } |
4014 | |
4072 | |
4015 | { |
4073 | { |