1 | # |
1 | # |
2 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | # |
3 | # |
4 | # Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | # Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | # |
5 | # |
6 | # Deliantra is free software: you can redistribute it and/or modify it under |
6 | # Deliantra is free software: you can redistribute it and/or modify it under |
7 | # the terms of the Affero GNU General Public License as published by the |
7 | # the terms of the Affero GNU General Public License as published by the |
8 | # Free Software Foundation, either version 3 of the License, or (at your |
8 | # Free Software Foundation, either version 3 of the License, or (at your |
9 | # option) any later version. |
9 | # option) any later version. |
… | |
… | |
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 = (); |
… | |
… | |
93 | our @EVENT; |
93 | our @EVENT; |
94 | our @REFLECT; # set by XS |
94 | our @REFLECT; # set by XS |
95 | our %REFLECT; # set by us |
95 | our %REFLECT; # set by us |
96 | |
96 | |
97 | our $CONFDIR = confdir; |
97 | our $CONFDIR = confdir; |
|
|
98 | |
98 | our $DATADIR = datadir; |
99 | our $DATADIR = datadir; |
99 | our $LIBDIR = "$DATADIR/ext"; |
100 | our $LIBDIR = "$DATADIR/ext"; |
100 | our $PODDIR = "$DATADIR/pod"; |
101 | our $PODDIR = "$DATADIR/pod"; |
101 | our $MAPDIR = "$DATADIR/" . mapdir; |
102 | our $MAPDIR = "$DATADIR/" . mapdir; |
|
|
103 | |
102 | our $LOCALDIR = localdir; |
104 | our $LOCALDIR = localdir; |
103 | our $TMPDIR = "$LOCALDIR/" . tmpdir; |
105 | our $TMPDIR = "$LOCALDIR/" . tmpdir; |
104 | our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; |
106 | our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; |
105 | our $PLAYERDIR = "$LOCALDIR/" . playerdir; |
107 | our $PLAYERDIR = "$LOCALDIR/" . playerdir; |
106 | our $RANDOMDIR = "$LOCALDIR/random"; |
108 | our $RANDOMDIR = "$LOCALDIR/random"; |
107 | our $BDBDIR = "$LOCALDIR/db"; |
109 | our $BDBDIR = "$LOCALDIR/db"; |
108 | our $PIDFILE = "$LOCALDIR/pid"; |
110 | our $PIDFILE = "$LOCALDIR/pid"; |
109 | our $RUNTIMEFILE = "$LOCALDIR/runtime"; |
111 | our $RUNTIMEFILE = "$LOCALDIR/runtime"; |
110 | |
112 | |
111 | our %RESOURCE; |
113 | our %RESOURCE; # unused |
112 | |
114 | |
113 | our $OUTPUT_RATE_MIN = 4000; |
115 | our $OUTPUT_RATE_MIN = 3000; |
114 | our $OUTPUT_RATE_MAX = 100000; |
116 | our $OUTPUT_RATE_MAX = 1000000; |
|
|
117 | |
|
|
118 | our $MAX_LINKS = 32; # how many chained exits to follow |
|
|
119 | our $VERBOSE_IO = 1; |
115 | |
120 | |
116 | our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) |
121 | our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) |
117 | our $NEXT_RUNTIME_WRITE; # when should the runtime file be written |
122 | our $NEXT_RUNTIME_WRITE; # when should the runtime file be written |
118 | our $NEXT_TICK; |
123 | our $NEXT_TICK; |
119 | our $USE_FSYNC = 1; # use fsync to write maps - default on |
124 | our $USE_FSYNC = 1; # use fsync to write maps - default on |
… | |
… | |
121 | our $BDB_DEADLOCK_WATCHER; |
126 | our $BDB_DEADLOCK_WATCHER; |
122 | our $BDB_CHECKPOINT_WATCHER; |
127 | our $BDB_CHECKPOINT_WATCHER; |
123 | our $BDB_TRICKLE_WATCHER; |
128 | our $BDB_TRICKLE_WATCHER; |
124 | our $DB_ENV; |
129 | our $DB_ENV; |
125 | |
130 | |
126 | our @EXTRA_MODULES = qw(pod match mapscript); |
131 | our @EXTRA_MODULES = qw(pod match mapscript incloader); |
127 | |
132 | |
128 | our %CFG; |
133 | our %CFG; |
129 | |
134 | |
130 | our $UPTIME; $UPTIME ||= time; |
135 | our $UPTIME; $UPTIME ||= time; |
131 | our $RUNTIME; |
136 | our $RUNTIME; |
… | |
… | |
230 | from wherever your confdir points to. |
235 | from wherever your confdir points to. |
231 | |
236 | |
232 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
237 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
233 | |
238 | |
234 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
239 | 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 |
240 | 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. |
241 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
|
|
242 | |
|
|
243 | =cut |
|
|
244 | |
|
|
245 | sub wait_for_tick(); |
|
|
246 | sub wait_for_tick_begin(); |
237 | |
247 | |
238 | =item @cf::INVOKE_RESULTS |
248 | =item @cf::INVOKE_RESULTS |
239 | |
249 | |
240 | This array contains the results of the last C<invoke ()> call. When |
250 | 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 |
251 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
… | |
… | |
249 | |
259 | |
250 | =back |
260 | =back |
251 | |
261 | |
252 | =cut |
262 | =cut |
253 | |
263 | |
|
|
264 | sub error(@) { LOG llevError, join "", @_ } |
|
|
265 | sub warn (@) { LOG llevWarn , join "", @_ } |
|
|
266 | sub info (@) { LOG llevInfo , join "", @_ } |
|
|
267 | sub debug(@) { LOG llevDebug, join "", @_ } |
|
|
268 | sub trace(@) { LOG llevTrace, join "", @_ } |
|
|
269 | |
254 | $Coro::State::WARNHOOK = sub { |
270 | $Coro::State::WARNHOOK = sub { |
255 | my $msg = join "", @_; |
271 | my $msg = join "", @_; |
256 | |
272 | |
257 | $msg .= "\n" |
273 | $msg .= "\n" |
258 | unless $msg =~ /\n$/; |
274 | unless $msg =~ /\n$/; |
259 | |
275 | |
260 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
276 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
261 | |
277 | |
262 | LOG llevError, $msg; |
278 | LOG llevWarn, $msg; |
263 | }; |
279 | }; |
264 | |
280 | |
265 | $Coro::State::DIEHOOK = sub { |
281 | $Coro::State::DIEHOOK = sub { |
266 | return unless $^S eq 0; # "eq", not "==" |
282 | return unless $^S eq 0; # "eq", not "==" |
267 | |
283 | |
268 | warn Carp::longmess $_[0]; |
284 | error Carp::longmess $_[0]; |
269 | |
285 | |
270 | if (in_main) {#d# |
286 | if (in_main) {#d# |
271 | warn "DIEHOOK called in main context, Coro bug?\n";#d# |
287 | error "DIEHOOK called in main context, Coro bug?\n";#d# |
272 | return;#d# |
288 | return;#d# |
273 | }#d# |
289 | }#d# |
274 | |
290 | |
275 | # kill coroutine otherwise |
291 | # kill coroutine otherwise |
276 | Coro::terminate |
292 | Coro::terminate |
… | |
… | |
298 | } |
314 | } |
299 | |
315 | |
300 | $EV::DIED = sub { |
316 | $EV::DIED = sub { |
301 | Carp::cluck "error in event callback: @_"; |
317 | Carp::cluck "error in event callback: @_"; |
302 | }; |
318 | }; |
|
|
319 | |
|
|
320 | ############################################################################# |
|
|
321 | |
|
|
322 | sub fork_call(&@); |
|
|
323 | sub get_slot($;$$); |
303 | |
324 | |
304 | ############################################################################# |
325 | ############################################################################# |
305 | |
326 | |
306 | =head2 UTILITY FUNCTIONS |
327 | =head2 UTILITY FUNCTIONS |
307 | |
328 | |
… | |
… | |
328 | $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; |
349 | $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; |
329 | $d |
350 | $d |
330 | } || "[unable to dump $_[0]: '$@']"; |
351 | } || "[unable to dump $_[0]: '$@']"; |
331 | } |
352 | } |
332 | |
353 | |
|
|
354 | =item $scalar = load_file $path |
|
|
355 | |
|
|
356 | Loads the given file from path and returns its contents. Croaks on error |
|
|
357 | and can block. |
|
|
358 | |
|
|
359 | =cut |
|
|
360 | |
|
|
361 | sub load_file($) { |
|
|
362 | 0 <= aio_load $_[0], my $data |
|
|
363 | or Carp::croak "$_[0]: $!"; |
|
|
364 | |
|
|
365 | $data |
|
|
366 | } |
|
|
367 | |
333 | =item $ref = cf::decode_json $json |
368 | =item $ref = cf::decode_json $json |
334 | |
369 | |
335 | Converts a JSON string into the corresponding perl data structure. |
370 | Converts a JSON string into the corresponding perl data structure. |
336 | |
371 | |
337 | =item $json = cf::encode_json $ref |
372 | =item $json = cf::encode_json $ref |
… | |
… | |
343 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
378 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
344 | |
379 | |
345 | sub encode_json($) { $json_coder->encode ($_[0]) } |
380 | sub encode_json($) { $json_coder->encode ($_[0]) } |
346 | sub decode_json($) { $json_coder->decode ($_[0]) } |
381 | sub decode_json($) { $json_coder->decode ($_[0]) } |
347 | |
382 | |
|
|
383 | =item $ref = cf::decode_storable $scalar |
|
|
384 | |
|
|
385 | Same as Coro::Storable::thaw, so blocks. |
|
|
386 | |
|
|
387 | =cut |
|
|
388 | |
|
|
389 | BEGIN { *decode_storable = \&Coro::Storable::thaw } |
|
|
390 | |
|
|
391 | =item $ref = cf::decode_yaml $scalar |
|
|
392 | |
|
|
393 | Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). |
|
|
394 | |
|
|
395 | =cut |
|
|
396 | |
|
|
397 | sub decode_yaml($) { |
|
|
398 | fork_call { YAML::XS::Load $_[0] } @_ |
|
|
399 | } |
|
|
400 | |
|
|
401 | =item $scalar = cf::unlzf $scalar |
|
|
402 | |
|
|
403 | Same as Compress::LZF::compress, but takes server ticks into account, so |
|
|
404 | blocks. |
|
|
405 | |
|
|
406 | =cut |
|
|
407 | |
|
|
408 | sub unlzf($) { |
|
|
409 | # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine) |
|
|
410 | cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf"; |
|
|
411 | Compress::LZF::decompress $_[0] |
|
|
412 | } |
|
|
413 | |
348 | =item cf::post_init { BLOCK } |
414 | =item cf::post_init { BLOCK } |
349 | |
415 | |
350 | Execute the given codeblock, I<after> all extensions have been (re-)loaded, |
416 | Execute the given codeblock, I<after> all extensions have been (re-)loaded, |
351 | but I<before> the server starts ticking again. |
417 | but I<before> the server starts ticking again. |
352 | |
418 | |
353 | The cdoeblock will have a single boolean argument to indicate whether this |
419 | The codeblock will have a single boolean argument to indicate whether this |
354 | is a reload or not. |
420 | is a reload or not. |
355 | |
421 | |
356 | =cut |
422 | =cut |
357 | |
423 | |
358 | sub post_init(&) { |
424 | sub post_init(&) { |
359 | push @POST_INIT, shift; |
425 | push @POST_INIT, shift; |
|
|
426 | } |
|
|
427 | |
|
|
428 | sub _post_init { |
|
|
429 | trace "running post_init jobs"; |
|
|
430 | |
|
|
431 | # run them in parallel... |
|
|
432 | |
|
|
433 | my @join; |
|
|
434 | |
|
|
435 | while () { |
|
|
436 | push @join, map &Coro::async ($_, 0), @POST_INIT; |
|
|
437 | @POST_INIT = (); |
|
|
438 | |
|
|
439 | @join or last; |
|
|
440 | |
|
|
441 | (pop @join)->join; |
|
|
442 | } |
360 | } |
443 | } |
361 | |
444 | |
362 | =item cf::lock_wait $string |
445 | =item cf::lock_wait $string |
363 | |
446 | |
364 | Wait until the given lock is available. See cf::lock_acquire. |
447 | Wait until the given lock is available. See cf::lock_acquire. |
… | |
… | |
417 | EV::periodic $start, $interval, 0, $cb |
500 | EV::periodic $start, $interval, 0, $cb |
418 | } |
501 | } |
419 | |
502 | |
420 | =item cf::get_slot $time[, $priority[, $name]] |
503 | =item cf::get_slot $time[, $priority[, $name]] |
421 | |
504 | |
422 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
505 | Allocate $time seconds of blocking CPU time at priority C<$priority> |
423 | This call blocks and returns only when you have at least C<$time> seconds |
506 | (default: 0): This call blocks and returns only when you have at least |
424 | of cpu time till the next tick. The slot is only valid till the next cede. |
507 | C<$time> seconds of cpu time till the next tick. The slot is only valid |
|
|
508 | till the next cede. |
|
|
509 | |
|
|
510 | Background jobs should use a priority les than zero, interactive jobs |
|
|
511 | should use 100 or more. |
425 | |
512 | |
426 | The optional C<$name> can be used to identify the job to run. It might be |
513 | The optional C<$name> can be used to identify the job to run. It might be |
427 | used for statistical purposes and should identify the same time-class. |
514 | used for statistical purposes and should identify the same time-class. |
428 | |
515 | |
429 | Useful for short background jobs. |
516 | Useful for short background jobs. |
… | |
… | |
509 | =cut |
596 | =cut |
510 | |
597 | |
511 | sub sync_job(&) { |
598 | sub sync_job(&) { |
512 | my ($job) = @_; |
599 | my ($job) = @_; |
513 | |
600 | |
514 | if ($Coro::current == $Coro::main) { |
601 | if (in_main) { |
515 | my $time = AE::time; |
602 | my $time = AE::time; |
516 | |
603 | |
517 | # this is the main coro, too bad, we have to block |
604 | # this is the main coro, too bad, we have to block |
518 | # till the operation succeeds, freezing the server :/ |
605 | # till the operation succeeds, freezing the server :/ |
519 | |
606 | |
520 | LOG llevError, Carp::longmess "sync job";#d# |
607 | #LOG llevError, Carp::longmess "sync job";#d# |
521 | |
608 | |
522 | my $freeze_guard = freeze_mainloop; |
609 | my $freeze_guard = freeze_mainloop; |
523 | |
610 | |
524 | my $busy = 1; |
611 | my $busy = 1; |
525 | my @res; |
612 | my @res; |
526 | |
613 | |
527 | (async { |
614 | (async { |
528 | $Coro::current->desc ("sync job coro"); |
615 | $Coro::current->desc ("sync job coro"); |
529 | @res = eval { $job->() }; |
616 | @res = eval { $job->() }; |
530 | warn $@ if $@; |
617 | error $@ if $@; |
531 | undef $busy; |
618 | undef $busy; |
532 | })->prio (Coro::PRIO_MAX); |
619 | })->prio (Coro::PRIO_MAX); |
533 | |
620 | |
534 | while ($busy) { |
621 | while ($busy) { |
535 | if (Coro::nready) { |
622 | if (Coro::nready) { |
… | |
… | |
569 | $EXT_CORO{$coro+0} = $coro; |
656 | $EXT_CORO{$coro+0} = $coro; |
570 | |
657 | |
571 | $coro |
658 | $coro |
572 | } |
659 | } |
573 | |
660 | |
574 | =item fork_call { }, $args |
661 | =item fork_call { }, @args |
575 | |
662 | |
576 | Executes the given code block with the given arguments in a seperate |
663 | Executes the given code block with the given arguments in a seperate |
577 | process, returning the results. Everything must be serialisable with |
664 | process, returning the results. Everything must be serialisable with |
578 | Coro::Storable. May, of course, block. Note that the executed sub may |
665 | Coro::Storable. May, of course, block. Note that the executed sub may |
579 | never block itself or use any form of event handling. |
666 | never block itself or use any form of event handling. |
580 | |
667 | |
581 | =cut |
668 | =cut |
582 | |
669 | |
|
|
670 | sub post_fork { |
|
|
671 | reset_signals; |
|
|
672 | } |
|
|
673 | |
583 | sub fork_call(&@) { |
674 | sub fork_call(&@) { |
584 | my ($cb, @args) = @_; |
675 | my ($cb, @args) = @_; |
585 | |
676 | |
586 | # we seemingly have to make a local copy of the whole thing, |
677 | # we seemingly have to make a local copy of the whole thing, |
587 | # otherwise perl prematurely frees the stuff :/ |
678 | # otherwise perl prematurely frees the stuff :/ |
588 | # TODO: investigate and fix (likely this will be rather laborious) |
679 | # TODO: investigate and fix (likely this will be rather laborious) |
589 | |
680 | |
590 | my @res = Coro::Util::fork_eval { |
681 | my @res = Coro::Util::fork_eval { |
591 | reset_signals; |
682 | cf::post_fork; |
592 | &$cb |
683 | &$cb |
593 | }, @args; |
684 | } @args; |
594 | |
685 | |
595 | wantarray ? @res : $res[-1] |
686 | wantarray ? @res : $res[-1] |
596 | } |
687 | } |
597 | |
688 | |
598 | sub objinfo { |
689 | sub objinfo { |
… | |
… | |
648 | within each server. |
739 | within each server. |
649 | |
740 | |
650 | =cut |
741 | =cut |
651 | |
742 | |
652 | sub db_table($) { |
743 | sub db_table($) { |
|
|
744 | cf::error "db_get called from main context" |
|
|
745 | if $Coro::current == $Coro::main; |
|
|
746 | |
653 | my ($name) = @_; |
747 | my ($name) = @_; |
654 | my $db = BDB::db_create $DB_ENV; |
748 | my $db = BDB::db_create $DB_ENV; |
655 | |
749 | |
656 | eval { |
750 | eval { |
657 | $db->set_flags (BDB::CHKSUM); |
751 | $db->set_flags (BDB::CHKSUM); |
… | |
… | |
667 | } |
761 | } |
668 | |
762 | |
669 | our $DB; |
763 | our $DB; |
670 | |
764 | |
671 | sub db_init { |
765 | sub db_init { |
672 | cf::sync_job { |
|
|
673 | $DB ||= db_table "db"; |
766 | $DB ||= db_table "db"; |
674 | }; |
|
|
675 | } |
767 | } |
676 | |
768 | |
677 | sub db_get($$) { |
769 | sub db_get($$) { |
678 | my $key = "$_[0]/$_[1]"; |
770 | my $key = "$_[0]/$_[1]"; |
679 | |
771 | |
680 | cf::sync_job { |
772 | cf::error "db_get called from main context" |
|
|
773 | if $Coro::current == $Coro::main; |
|
|
774 | |
681 | BDB::db_get $DB, undef, $key, my $data; |
775 | BDB::db_get $DB, undef, $key, my $data; |
682 | |
776 | |
683 | $! ? () |
777 | $! ? () |
684 | : $data |
778 | : $data |
685 | } |
|
|
686 | } |
779 | } |
687 | |
780 | |
688 | sub db_put($$$) { |
781 | sub db_put($$$) { |
689 | BDB::dbreq_pri 4; |
782 | BDB::dbreq_pri 4; |
690 | BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; |
783 | BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; |
… | |
… | |
718 | |
811 | |
719 | my @data; |
812 | my @data; |
720 | my $md5; |
813 | my $md5; |
721 | |
814 | |
722 | for (0 .. $#$src) { |
815 | for (0 .. $#$src) { |
723 | 0 <= aio_load $src->[$_], $data[$_] |
816 | $data[$_] = load_file $src->[$_]; |
724 | or Carp::croak "$src->[$_]: $!"; |
|
|
725 | } |
817 | } |
726 | |
818 | |
727 | # if processing is expensive, check |
819 | # if processing is expensive, check |
728 | # checksum first |
820 | # checksum first |
729 | if (1) { |
821 | if (1) { |
… | |
… | |
746 | |
838 | |
747 | my $t1 = Time::HiRes::time; |
839 | my $t1 = Time::HiRes::time; |
748 | my $data = $process->(\@data); |
840 | my $data = $process->(\@data); |
749 | my $t2 = Time::HiRes::time; |
841 | my $t2 = Time::HiRes::time; |
750 | |
842 | |
751 | warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
843 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
752 | |
844 | |
753 | db_put cache => "$id/data", $data; |
845 | db_put cache => "$id/data", $data; |
754 | db_put cache => "$id/md5" , $md5; |
846 | db_put cache => "$id/md5" , $md5; |
755 | db_put cache => "$id/meta", $meta; |
847 | db_put cache => "$id/meta", $meta; |
756 | |
848 | |
… | |
… | |
766 | |
858 | |
767 | =cut |
859 | =cut |
768 | |
860 | |
769 | sub datalog($@) { |
861 | sub datalog($@) { |
770 | my ($type, %kv) = @_; |
862 | my ($type, %kv) = @_; |
771 | warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); |
863 | info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); |
772 | } |
864 | } |
773 | |
865 | |
774 | =back |
866 | =back |
775 | |
867 | |
776 | =cut |
868 | =cut |
… | |
… | |
971 | |
1063 | |
972 | } elsif (exists $cb_id{$type}) { |
1064 | } elsif (exists $cb_id{$type}) { |
973 | _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; |
1065 | _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; |
974 | |
1066 | |
975 | } elsif (ref $type) { |
1067 | } elsif (ref $type) { |
976 | warn "attaching objects not supported, ignoring.\n"; |
1068 | error "attaching objects not supported, ignoring.\n"; |
977 | |
1069 | |
978 | } else { |
1070 | } else { |
979 | shift @arg; |
1071 | shift @arg; |
980 | warn "attach argument '$type' not supported, ignoring.\n"; |
1072 | error "attach argument '$type' not supported, ignoring.\n"; |
981 | } |
1073 | } |
982 | } |
1074 | } |
983 | } |
1075 | } |
984 | |
1076 | |
985 | sub _object_attach { |
1077 | sub _object_attach { |
… | |
… | |
995 | _attach $registry, $klass, @attach; |
1087 | _attach $registry, $klass, @attach; |
996 | } |
1088 | } |
997 | |
1089 | |
998 | $obj->{$name} = \%arg; |
1090 | $obj->{$name} = \%arg; |
999 | } else { |
1091 | } else { |
1000 | warn "object uses attachment '$name' which is not available, postponing.\n"; |
1092 | info "object uses attachment '$name' which is not available, postponing.\n"; |
1001 | } |
1093 | } |
1002 | |
1094 | |
1003 | $obj->{_attachment}{$name} = undef; |
1095 | $obj->{_attachment}{$name} = undef; |
1004 | } |
1096 | } |
1005 | |
1097 | |
… | |
… | |
1064 | |
1156 | |
1065 | for (@$callbacks) { |
1157 | for (@$callbacks) { |
1066 | eval { &{$_->[1]} }; |
1158 | eval { &{$_->[1]} }; |
1067 | |
1159 | |
1068 | if ($@) { |
1160 | if ($@) { |
1069 | warn "$@"; |
|
|
1070 | warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; |
1161 | error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; |
1071 | override; |
1162 | override; |
1072 | } |
1163 | } |
1073 | |
1164 | |
1074 | return 1 if $override; |
1165 | return 1 if $override; |
1075 | } |
1166 | } |
… | |
… | |
1154 | for (@$attach) { |
1245 | for (@$attach) { |
1155 | my ($klass, @attach) = @$_; |
1246 | my ($klass, @attach) = @$_; |
1156 | _attach $registry, $klass, @attach; |
1247 | _attach $registry, $klass, @attach; |
1157 | } |
1248 | } |
1158 | } else { |
1249 | } else { |
1159 | warn "object uses attachment '$name' that is not available, postponing.\n"; |
1250 | info "object uses attachment '$name' that is not available, postponing.\n"; |
1160 | } |
1251 | } |
1161 | } |
1252 | } |
1162 | } |
1253 | } |
1163 | |
1254 | |
1164 | cf::attachable->attach ( |
1255 | cf::attachable->attach ( |
… | |
… | |
1191 | my ($filename, $rdata, $objs) = @_; |
1282 | my ($filename, $rdata, $objs) = @_; |
1192 | |
1283 | |
1193 | sync_job { |
1284 | sync_job { |
1194 | if (length $$rdata) { |
1285 | if (length $$rdata) { |
1195 | utf8::decode (my $decname = $filename); |
1286 | utf8::decode (my $decname = $filename); |
1196 | warn sprintf "saving %s (%d,%d)\n", |
1287 | trace sprintf "saving %s (%d,%d)\n", |
1197 | $decname, length $$rdata, scalar @$objs; |
1288 | $decname, length $$rdata, scalar @$objs |
|
|
1289 | if $VERBOSE_IO; |
1198 | |
1290 | |
1199 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1291 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1200 | aio_chmod $fh, SAVE_MODE; |
1292 | aio_chmod $fh, SAVE_MODE; |
1201 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1293 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1202 | if ($cf::USE_FSYNC) { |
1294 | if ($cf::USE_FSYNC) { |
… | |
… | |
1224 | aio_rename "$filename~", $filename; |
1316 | aio_rename "$filename~", $filename; |
1225 | |
1317 | |
1226 | $filename =~ s%/[^/]+$%%; |
1318 | $filename =~ s%/[^/]+$%%; |
1227 | aio_pathsync $filename if $cf::USE_FSYNC; |
1319 | aio_pathsync $filename if $cf::USE_FSYNC; |
1228 | } else { |
1320 | } else { |
1229 | warn "unable to save objects: $filename~: $!\n"; |
1321 | error "unable to save objects: $filename~: $!\n"; |
1230 | } |
1322 | } |
1231 | } else { |
1323 | } else { |
1232 | aio_unlink $filename; |
1324 | aio_unlink $filename; |
1233 | aio_unlink "$filename.pst"; |
1325 | aio_unlink "$filename.pst"; |
1234 | } |
1326 | } |
… | |
… | |
1258 | my $st = eval { Coro::Storable::thaw $av }; |
1350 | my $st = eval { Coro::Storable::thaw $av }; |
1259 | $av = $st->{objs}; |
1351 | $av = $st->{objs}; |
1260 | } |
1352 | } |
1261 | |
1353 | |
1262 | utf8::decode (my $decname = $filename); |
1354 | utf8::decode (my $decname = $filename); |
1263 | warn sprintf "loading %s (%d,%d)\n", |
1355 | trace sprintf "loading %s (%d,%d)\n", |
1264 | $decname, length $data, scalar @{$av || []}; |
1356 | $decname, length $data, scalar @{$av || []} |
|
|
1357 | if $VERBOSE_IO; |
1265 | |
1358 | |
1266 | ($data, $av) |
1359 | ($data, $av) |
1267 | } |
1360 | } |
1268 | |
1361 | |
1269 | =head2 COMMAND CALLBACKS |
1362 | =head2 COMMAND CALLBACKS |
… | |
… | |
1361 | |
1454 | |
1362 | $pl->ext_reply ($reply, @reply) |
1455 | $pl->ext_reply ($reply, @reply) |
1363 | if $reply; |
1456 | if $reply; |
1364 | |
1457 | |
1365 | } else { |
1458 | } else { |
1366 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1459 | error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1367 | } |
1460 | } |
1368 | |
1461 | |
1369 | cf::override; |
1462 | cf::override; |
1370 | }, |
1463 | }, |
1371 | ); |
1464 | ); |
… | |
… | |
1382 | |
1475 | |
1383 | $grp |
1476 | $grp |
1384 | } |
1477 | } |
1385 | |
1478 | |
1386 | sub load_extensions { |
1479 | sub load_extensions { |
|
|
1480 | info "loading extensions..."; |
|
|
1481 | |
1387 | cf::sync_job { |
1482 | cf::sync_job { |
1388 | my %todo; |
1483 | my %todo; |
1389 | |
1484 | |
1390 | for my $path (<$LIBDIR/*.ext>) { |
1485 | for my $path (<$LIBDIR/*.ext>) { |
1391 | next unless -r $path; |
1486 | next unless -r $path; |
… | |
… | |
1409 | |
1504 | |
1410 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1505 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1411 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1506 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1412 | |
1507 | |
1413 | $ext{source} = |
1508 | $ext{source} = |
1414 | "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" |
1509 | "package $pkg; use common::sense;\n" |
1415 | . "#line 1 \"$path\"\n{\n" |
1510 | . "#line 1 \"$path\"\n{\n" |
1416 | . $source |
1511 | . $source |
1417 | . "\n};\n1"; |
1512 | . "\n};\n1"; |
1418 | |
1513 | |
1419 | $todo{$base} = \%ext; |
1514 | $todo{$base} = \%ext; |
… | |
… | |
1431 | for (split /,\s*/, $v->{meta}{depends}) { |
1526 | for (split /,\s*/, $v->{meta}{depends}) { |
1432 | next ext |
1527 | next ext |
1433 | unless exists $done{$_}; |
1528 | unless exists $done{$_}; |
1434 | } |
1529 | } |
1435 | |
1530 | |
1436 | warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; |
1531 | trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; |
1437 | |
1532 | |
1438 | my $active = eval $v->{source}; |
1533 | my $active = eval $v->{source}; |
1439 | |
1534 | |
1440 | if (length $@) { |
1535 | if (length $@) { |
1441 | warn "$v->{path}: $@\n"; |
1536 | error "$v->{path}: $@\n"; |
1442 | |
1537 | |
1443 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1538 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1444 | if exists $v->{meta}{mandatory}; |
1539 | if exists $v->{meta}{mandatory}; |
1445 | |
1540 | |
1446 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
1541 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
… | |
… | |
1448 | } else { |
1543 | } else { |
1449 | $done{$k} = delete $todo{$k}; |
1544 | $done{$k} = delete $todo{$k}; |
1450 | push @EXTS, $v->{pkg}; |
1545 | push @EXTS, $v->{pkg}; |
1451 | $progress = 1; |
1546 | $progress = 1; |
1452 | |
1547 | |
1453 | warn "$v->{base}: extension inactive.\n" |
1548 | info "$v->{base}: extension inactive.\n" |
1454 | unless $active; |
1549 | unless $active; |
1455 | } |
1550 | } |
1456 | } |
1551 | } |
1457 | |
1552 | |
1458 | unless ($progress) { |
1553 | unless ($progress) { |
… | |
… | |
1460 | |
1555 | |
1461 | while (my ($k, $v) = each %todo) { |
1556 | while (my ($k, $v) = each %todo) { |
1462 | cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." |
1557 | cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." |
1463 | if exists $v->{meta}{mandatory}; |
1558 | if exists $v->{meta}{mandatory}; |
1464 | } |
1559 | } |
|
|
1560 | |
|
|
1561 | last; |
1465 | } |
1562 | } |
1466 | } |
1563 | } |
1467 | }; |
1564 | }; |
1468 | } |
1565 | } |
1469 | |
1566 | |
… | |
… | |
1627 | my $name = $pl->ob->name; |
1724 | my $name = $pl->ob->name; |
1628 | |
1725 | |
1629 | $pl->{deny_save} = 1; |
1726 | $pl->{deny_save} = 1; |
1630 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1727 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1631 | |
1728 | |
1632 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1729 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns; |
1633 | $pl->deactivate; |
1730 | $pl->deactivate; |
|
|
1731 | |
1634 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1732 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1635 | $pl->ob->check_score; |
|
|
1636 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1733 | $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns; |
|
|
1734 | ext::highscore::check ($pl->ob); |
|
|
1735 | |
1637 | $pl->ns->destroy if $pl->ns; |
1736 | $pl->ns->destroy if $pl->ns; |
1638 | |
1737 | |
1639 | my $path = playerdir $pl; |
1738 | my $path = playerdir $pl; |
1640 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1739 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1641 | aio_rename $path, $temp; |
1740 | aio_rename $path, $temp; |
… | |
… | |
1807 | sub generate_random_map { |
1906 | sub generate_random_map { |
1808 | my ($self, $rmp) = @_; |
1907 | my ($self, $rmp) = @_; |
1809 | |
1908 | |
1810 | my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM |
1909 | my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM |
1811 | |
1910 | |
1812 | # mit "rum" bekleckern, nicht |
|
|
1813 | $self->_create_random_map ( |
1911 | $self->_create_random_map ($rmp); |
1814 | $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, |
|
|
1815 | $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle}, |
|
|
1816 | $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, |
|
|
1817 | $rmp->{exit_on_final_map}, |
|
|
1818 | $rmp->{xsize}, $rmp->{ysize}, |
|
|
1819 | $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, |
|
|
1820 | $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, |
|
|
1821 | $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, |
|
|
1822 | $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, |
|
|
1823 | $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, |
|
|
1824 | (cf::region::find $rmp->{region}), $rmp->{custom} |
|
|
1825 | ) |
|
|
1826 | } |
1912 | } |
1827 | |
1913 | |
1828 | =item cf::map->register ($regex, $prio) |
1914 | =item cf::map->register ($regex, $prio) |
1829 | |
1915 | |
1830 | Register a handler for the map path matching the given regex at the |
1916 | Register a handler for the map path matching the given regex at the |
… | |
… | |
1835 | |
1921 | |
1836 | sub register { |
1922 | sub register { |
1837 | my (undef, $regex, $prio) = @_; |
1923 | my (undef, $regex, $prio) = @_; |
1838 | my $pkg = caller; |
1924 | my $pkg = caller; |
1839 | |
1925 | |
1840 | no strict; |
|
|
1841 | push @{"$pkg\::ISA"}, __PACKAGE__; |
1926 | push @{"$pkg\::ISA"}, __PACKAGE__; |
1842 | |
1927 | |
1843 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
1928 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
1844 | } |
1929 | } |
1845 | |
1930 | |
1846 | # also paths starting with '/' |
1931 | # also paths starting with '/' |
1847 | $EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; |
1932 | $EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}]; |
1848 | |
1933 | |
1849 | sub thawer_merge { |
1934 | sub thawer_merge { |
1850 | my ($self, $merge) = @_; |
1935 | my ($self, $merge) = @_; |
1851 | |
1936 | |
1852 | # we have to keep some variables in memory intact |
1937 | # we have to keep some variables in memory intact |
… | |
… | |
1857 | } |
1942 | } |
1858 | |
1943 | |
1859 | sub normalise { |
1944 | sub normalise { |
1860 | my ($path, $base) = @_; |
1945 | my ($path, $base) = @_; |
1861 | |
1946 | |
1862 | $path = "$path"; # make sure its a string |
1947 | $path = "$path"; # make sure it's a string |
1863 | |
1948 | |
1864 | $path =~ s/\.map$//; |
1949 | $path =~ s/\.map$//; |
1865 | |
1950 | |
1866 | # map plan: |
1951 | # map plan: |
1867 | # |
1952 | # |
… | |
… | |
1882 | $base =~ s{[^/]+/?$}{}; |
1967 | $base =~ s{[^/]+/?$}{}; |
1883 | $path = "$base/$path"; |
1968 | $path = "$base/$path"; |
1884 | } |
1969 | } |
1885 | |
1970 | |
1886 | for ($path) { |
1971 | for ($path) { |
1887 | redo if s{//}{/}; |
|
|
1888 | redo if s{/\.?/}{/}; |
1972 | redo if s{/\.?/}{/}; |
1889 | redo if s{/[^/]+/\.\./}{/}; |
1973 | redo if s{/[^/]+/\.\./}{/}; |
1890 | } |
1974 | } |
1891 | |
1975 | |
1892 | $path |
1976 | $path |
… | |
… | |
1906 | $self->init; # pass $1 etc. |
1990 | $self->init; # pass $1 etc. |
1907 | return $self; |
1991 | return $self; |
1908 | } |
1992 | } |
1909 | } |
1993 | } |
1910 | |
1994 | |
1911 | Carp::cluck "unable to resolve path '$path' (base '$base')."; |
1995 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
1912 | () |
1996 | () |
1913 | } |
1997 | } |
1914 | |
1998 | |
|
|
1999 | # may re-bless or do other evil things |
1915 | sub init { |
2000 | sub init { |
1916 | my ($self) = @_; |
2001 | my ($self) = @_; |
1917 | |
2002 | |
1918 | $self |
2003 | $self |
1919 | } |
2004 | } |
… | |
… | |
1984 | $self->{load_path} = $path; |
2069 | $self->{load_path} = $path; |
1985 | |
2070 | |
1986 | 1 |
2071 | 1 |
1987 | } |
2072 | } |
1988 | |
2073 | |
|
|
2074 | # used to laod the header of an original map |
1989 | sub load_header_orig { |
2075 | sub load_header_orig { |
1990 | my ($self) = @_; |
2076 | my ($self) = @_; |
1991 | |
2077 | |
1992 | $self->load_header_from ($self->load_path) |
2078 | $self->load_header_from ($self->load_path) |
1993 | } |
2079 | } |
1994 | |
2080 | |
|
|
2081 | # used to laod the header of an instantiated map |
1995 | sub load_header_temp { |
2082 | sub load_header_temp { |
1996 | my ($self) = @_; |
2083 | my ($self) = @_; |
1997 | |
2084 | |
1998 | $self->load_header_from ($self->save_path) |
2085 | $self->load_header_from ($self->save_path) |
1999 | } |
2086 | } |
2000 | |
2087 | |
|
|
2088 | # called after loading the header from an instantiated map |
2001 | sub prepare_temp { |
2089 | sub prepare_temp { |
2002 | my ($self) = @_; |
2090 | my ($self) = @_; |
2003 | |
2091 | |
2004 | $self->last_access ((delete $self->{last_access}) |
2092 | $self->last_access ((delete $self->{last_access}) |
2005 | || $cf::RUNTIME); #d# |
2093 | || $cf::RUNTIME); #d# |
2006 | # safety |
2094 | # safety |
2007 | $self->{instantiate_time} = $cf::RUNTIME |
2095 | $self->{instantiate_time} = $cf::RUNTIME |
2008 | if $self->{instantiate_time} > $cf::RUNTIME; |
2096 | if $self->{instantiate_time} > $cf::RUNTIME; |
2009 | } |
2097 | } |
2010 | |
2098 | |
|
|
2099 | # called after loading the header from an original map |
2011 | sub prepare_orig { |
2100 | sub prepare_orig { |
2012 | my ($self) = @_; |
2101 | my ($self) = @_; |
2013 | |
2102 | |
2014 | $self->{load_original} = 1; |
2103 | $self->{load_original} = 1; |
2015 | $self->{instantiate_time} = $cf::RUNTIME; |
2104 | $self->{instantiate_time} = $cf::RUNTIME; |
… | |
… | |
2039 | |
2128 | |
2040 | sub find; |
2129 | sub find; |
2041 | sub find { |
2130 | sub find { |
2042 | my ($path, $origin) = @_; |
2131 | my ($path, $origin) = @_; |
2043 | |
2132 | |
|
|
2133 | cf::cede_to_tick; |
|
|
2134 | |
2044 | $path = normalise $path, $origin && $origin->path; |
2135 | $path = normalise $path, $origin; |
2045 | |
2136 | |
2046 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2137 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2047 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2138 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2048 | |
2139 | |
2049 | $cf::MAP{$path} || do { |
2140 | $cf::MAP{$path} || do { |
… | |
… | |
2082 | my $guard = cf::lock_acquire "map_data:$path"; |
2173 | my $guard = cf::lock_acquire "map_data:$path"; |
2083 | |
2174 | |
2084 | return unless $self->valid; |
2175 | return unless $self->valid; |
2085 | return unless $self->in_memory == cf::MAP_SWAPPED; |
2176 | return unless $self->in_memory == cf::MAP_SWAPPED; |
2086 | |
2177 | |
2087 | $self->in_memory (cf::MAP_LOADING); |
|
|
2088 | |
|
|
2089 | $self->alloc; |
2178 | $self->alloc; |
2090 | |
2179 | |
2091 | $self->pre_load; |
2180 | $self->pre_load; |
2092 | cf::cede_to_tick; |
2181 | cf::cede_to_tick; |
2093 | |
2182 | |
|
|
2183 | if (exists $self->{load_path}) { |
2094 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
2184 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
2095 | $f->skip_block; |
2185 | $f->skip_block; |
2096 | $self->_load_objects ($f) |
2186 | $self->_load_objects ($f) |
2097 | or return; |
2187 | or return; |
2098 | |
2188 | |
2099 | $self->post_load_original |
2189 | $self->post_load_original |
2100 | if delete $self->{load_original}; |
2190 | if delete $self->{load_original}; |
2101 | |
2191 | |
2102 | if (my $uniq = $self->uniq_path) { |
2192 | if (my $uniq = $self->uniq_path) { |
2103 | utf8::encode $uniq; |
2193 | utf8::encode $uniq; |
2104 | unless (aio_stat $uniq) { |
2194 | unless (aio_stat $uniq) { |
2105 | if (my $f = new_from_file cf::object::thawer $uniq) { |
2195 | if (my $f = new_from_file cf::object::thawer $uniq) { |
2106 | $self->clear_unique_items; |
2196 | $self->clear_unique_items; |
2107 | $self->_load_objects ($f); |
2197 | $self->_load_objects ($f); |
2108 | $f->resolve_delayed_derefs; |
2198 | $f->resolve_delayed_derefs; |
|
|
2199 | } |
2109 | } |
2200 | } |
2110 | } |
2201 | } |
2111 | } |
|
|
2112 | |
2202 | |
2113 | $f->resolve_delayed_derefs; |
2203 | $f->resolve_delayed_derefs; |
|
|
2204 | } else { |
|
|
2205 | $self->post_load_original |
|
|
2206 | if delete $self->{load_original}; |
|
|
2207 | } |
|
|
2208 | |
|
|
2209 | $self->in_memory (cf::MAP_INACTIVE); |
2114 | |
2210 | |
2115 | cf::cede_to_tick; |
2211 | cf::cede_to_tick; |
2116 | # now do the right thing for maps |
2212 | # now do the right thing for maps |
2117 | $self->link_multipart_objects; |
2213 | $self->link_multipart_objects; |
2118 | $self->difficulty ($self->estimate_difficulty) |
2214 | $self->difficulty ($self->estimate_difficulty) |
… | |
… | |
2122 | unless ($self->{deny_activate}) { |
2218 | unless ($self->{deny_activate}) { |
2123 | $self->decay_objects; |
2219 | $self->decay_objects; |
2124 | $self->fix_auto_apply; |
2220 | $self->fix_auto_apply; |
2125 | $self->update_buttons; |
2221 | $self->update_buttons; |
2126 | cf::cede_to_tick; |
2222 | cf::cede_to_tick; |
2127 | $self->activate; |
2223 | #$self->activate; # no longer activate maps automatically |
2128 | } |
2224 | } |
2129 | |
2225 | |
2130 | $self->{last_save} = $cf::RUNTIME; |
2226 | $self->{last_save} = $cf::RUNTIME; |
2131 | $self->last_access ($cf::RUNTIME); |
2227 | $self->last_access ($cf::RUNTIME); |
2132 | |
|
|
2133 | $self->in_memory (cf::MAP_ACTIVE); |
|
|
2134 | } |
2228 | } |
2135 | |
2229 | |
2136 | $self->post_load; |
2230 | $self->post_load; |
|
|
2231 | |
|
|
2232 | 1 |
2137 | } |
2233 | } |
2138 | |
2234 | |
2139 | # customize the map for a given player, i.e. |
2235 | # customize the map for a given player, i.e. |
2140 | # return the _real_ map. used by e.g. per-player |
2236 | # return the _real_ map. used by e.g. per-player |
2141 | # maps to change the path to ~playername/mappath |
2237 | # maps to change the path to ~playername/mappath |
… | |
… | |
2162 | or next; |
2258 | or next; |
2163 | $neigh = find $neigh, $map |
2259 | $neigh = find $neigh, $map |
2164 | or next; |
2260 | or next; |
2165 | $neigh->load; |
2261 | $neigh->load; |
2166 | |
2262 | |
|
|
2263 | # now find the diagonal neighbours |
2167 | push @neigh, |
2264 | push @neigh, |
2168 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
2265 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
2169 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
2266 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
2170 | } |
2267 | } |
2171 | |
2268 | |
… | |
… | |
2178 | } |
2275 | } |
2179 | |
2276 | |
2180 | sub find_sync { |
2277 | sub find_sync { |
2181 | my ($path, $origin) = @_; |
2278 | my ($path, $origin) = @_; |
2182 | |
2279 | |
2183 | cf::sync_job { find $path, $origin } |
2280 | # it's a bug to call this from the main context |
|
|
2281 | return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" |
|
|
2282 | if $Coro::current == $Coro::main; |
|
|
2283 | |
|
|
2284 | find $path, $origin |
2184 | } |
2285 | } |
2185 | |
2286 | |
2186 | sub do_load_sync { |
2287 | sub do_load_sync { |
2187 | my ($map) = @_; |
2288 | my ($map) = @_; |
2188 | |
2289 | |
|
|
2290 | # it's a bug to call this from the main context |
2189 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
2291 | return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" |
2190 | if $Coro::current == $Coro::main; |
2292 | if $Coro::current == $Coro::main; |
2191 | |
2293 | |
2192 | cf::sync_job { $map->load }; |
2294 | $map->load; |
2193 | } |
2295 | } |
2194 | |
2296 | |
2195 | our %MAP_PREFETCH; |
2297 | our %MAP_PREFETCH; |
2196 | our $MAP_PREFETCHER = undef; |
2298 | our $MAP_PREFETCHER = undef; |
2197 | |
2299 | |
2198 | sub find_async { |
2300 | sub find_async { |
2199 | my ($path, $origin, $load) = @_; |
2301 | my ($path, $origin, $load) = @_; |
2200 | |
2302 | |
2201 | $path = normalise $path, $origin && $origin->{path}; |
2303 | $path = normalise $path, $origin; |
2202 | |
2304 | |
2203 | if (my $map = $cf::MAP{$path}) { |
2305 | if (my $map = $cf::MAP{$path}) { |
2204 | return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; |
2306 | return $map if !$load || $map->linkable; |
2205 | } |
2307 | } |
2206 | |
2308 | |
2207 | $MAP_PREFETCH{$path} |= $load; |
2309 | $MAP_PREFETCH{$path} |= $load; |
2208 | |
2310 | |
2209 | $MAP_PREFETCHER ||= cf::async { |
2311 | $MAP_PREFETCHER ||= cf::async { |
… | |
… | |
2268 | sub swap_out { |
2370 | sub swap_out { |
2269 | my ($self) = @_; |
2371 | my ($self) = @_; |
2270 | |
2372 | |
2271 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2373 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2272 | |
2374 | |
2273 | return if $self->in_memory != cf::MAP_ACTIVE; |
2375 | return if !$self->linkable; |
2274 | return if $self->{deny_save}; |
2376 | return if $self->{deny_save}; |
2275 | return if $self->players; |
2377 | return if $self->players; |
2276 | |
2378 | |
2277 | # first deactivate the map and "unlink" it from the core |
2379 | # first deactivate the map and "unlink" it from the core |
2278 | $self->deactivate; |
2380 | $self->deactivate; |
… | |
… | |
2309 | |
2411 | |
2310 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2412 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2311 | |
2413 | |
2312 | return if $self->players; |
2414 | return if $self->players; |
2313 | |
2415 | |
2314 | warn "resetting map ", $self->path, "\n"; |
2416 | cf::trace "resetting map ", $self->path, "\n"; |
2315 | |
2417 | |
2316 | $self->in_memory (cf::MAP_SWAPPED); |
2418 | $self->in_memory (cf::MAP_SWAPPED); |
2317 | |
2419 | |
2318 | # need to save uniques path |
2420 | # need to save uniques path |
2319 | unless ($self->{deny_save}) { |
2421 | unless ($self->{deny_save}) { |
… | |
… | |
2343 | |
2445 | |
2344 | delete $cf::MAP{$self->path}; |
2446 | delete $cf::MAP{$self->path}; |
2345 | |
2447 | |
2346 | $self->unlink_save; |
2448 | $self->unlink_save; |
2347 | |
2449 | |
2348 | bless $self, "cf::map"; |
2450 | bless $self, "cf::map::wrap"; |
2349 | delete $self->{deny_reset}; |
2451 | delete $self->{deny_reset}; |
2350 | $self->{deny_save} = 1; |
2452 | $self->{deny_save} = 1; |
2351 | $self->reset_timeout (1); |
2453 | $self->reset_timeout (1); |
2352 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2454 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2353 | |
2455 | |
… | |
… | |
2583 | |
2685 | |
2584 | Freezes the player and moves him/her to a special map (C<{link}>). |
2686 | Freezes the player and moves him/her to a special map (C<{link}>). |
2585 | |
2687 | |
2586 | The player should be reasonably safe there for short amounts of time (e.g. |
2688 | 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, |
2689 | 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 |
2690 | though, as the player cannot control the character while it is on the link |
2589 | map. |
2691 | map. |
2590 | |
2692 | |
2591 | Will never block. |
2693 | Will never block. |
2592 | |
2694 | |
2593 | =item $player_object->leave_link ($map, $x, $y) |
2695 | =item $player_object->leave_link ($map, $x, $y) |
… | |
… | |
2614 | sub cf::object::player::enter_link { |
2716 | sub cf::object::player::enter_link { |
2615 | my ($self) = @_; |
2717 | my ($self) = @_; |
2616 | |
2718 | |
2617 | $self->deactivate_recursive; |
2719 | $self->deactivate_recursive; |
2618 | |
2720 | |
|
|
2721 | ++$self->{_link_recursion}; |
|
|
2722 | |
2619 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
2723 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
2620 | |
2724 | |
2621 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
2725 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
2622 | if $self->map && $self->map->{path} ne "{link}"; |
2726 | if $self->map && $self->map->{path} ne "{link}"; |
2623 | |
2727 | |
… | |
… | |
2654 | $map->load_neighbours; |
2758 | $map->load_neighbours; |
2655 | |
2759 | |
2656 | return unless $self->contr->active; |
2760 | return unless $self->contr->active; |
2657 | |
2761 | |
2658 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2762 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2659 | $self->enter_map ($map, $x, $y); |
2763 | if ($self->enter_map ($map, $x, $y)) { |
2660 | |
2764 | # entering was successful |
|
|
2765 | delete $self->{_link_recursion}; |
2661 | # only activate afterwards, to support waiting in hooks |
2766 | # only activate afterwards, to support waiting in hooks |
2662 | $self->activate_recursive; |
2767 | $self->activate_recursive; |
2663 | } |
2768 | } |
2664 | |
2769 | |
|
|
2770 | } |
|
|
2771 | |
2665 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
2772 | =item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]]) |
2666 | |
2773 | |
2667 | Moves the player to the given map-path and coordinates by first freezing |
2774 | Moves the player to the given map-path and coordinates by first freezing |
2668 | her, loading and preparing them map, calling the provided $check callback |
2775 | her, loading and preparing them map, calling the provided $check callback |
2669 | that has to return the map if sucecssful, and then unfreezes the player on |
2776 | that has to return the map if sucecssful, and then unfreezes the player on |
2670 | the new (success) or old (failed) map position. In either case, $done will |
2777 | the new (success) or old (failed) map position. In either case, $done will |
… | |
… | |
2677 | |
2784 | |
2678 | our $GOTOGEN; |
2785 | our $GOTOGEN; |
2679 | |
2786 | |
2680 | sub cf::object::player::goto { |
2787 | sub cf::object::player::goto { |
2681 | my ($self, $path, $x, $y, $check, $done) = @_; |
2788 | my ($self, $path, $x, $y, $check, $done) = @_; |
|
|
2789 | |
|
|
2790 | if ($self->{_link_recursion} >= $MAX_LINKS) { |
|
|
2791 | error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; |
|
|
2792 | $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); |
|
|
2793 | ($path, $x, $y) = @$EMERGENCY_POSITION; |
|
|
2794 | } |
2682 | |
2795 | |
2683 | # do generation counting so two concurrent goto's will be executed in-order |
2796 | # do generation counting so two concurrent goto's will be executed in-order |
2684 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2797 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2685 | |
2798 | |
2686 | $self->enter_link; |
2799 | $self->enter_link; |
… | |
… | |
2706 | ($path, $x, $y) = (undef, undef, undef); |
2819 | ($path, $x, $y) = (undef, undef, undef); |
2707 | } |
2820 | } |
2708 | } |
2821 | } |
2709 | |
2822 | |
2710 | my $map = eval { |
2823 | my $map = eval { |
2711 | my $map = defined $path ? cf::map::find $path : undef; |
2824 | my $map = defined $path ? cf::map::find $path, $self->map : undef; |
2712 | |
2825 | |
2713 | if ($map) { |
2826 | if ($map) { |
2714 | $map = $map->customise_for ($self); |
2827 | $map = $map->customise_for ($self); |
2715 | $map = $check->($map) if $check && $map; |
2828 | $map = $check->($map, $x, $y, $self) if $check && $map; |
2716 | } else { |
2829 | } else { |
2717 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2830 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2718 | } |
2831 | } |
2719 | |
2832 | |
2720 | $map |
2833 | $map |
… | |
… | |
2728 | if ($gen == $self->{_goto_generation}) { |
2841 | if ($gen == $self->{_goto_generation}) { |
2729 | delete $self->{_goto_generation}; |
2842 | delete $self->{_goto_generation}; |
2730 | $self->leave_link ($map, $x, $y); |
2843 | $self->leave_link ($map, $x, $y); |
2731 | } |
2844 | } |
2732 | |
2845 | |
2733 | $done->() if $done; |
2846 | $done->($self) if $done; |
2734 | })->prio (1); |
2847 | })->prio (1); |
2735 | } |
2848 | } |
2736 | |
2849 | |
2737 | =item $player_object->enter_exit ($exit_object) |
2850 | =item $player_object->enter_exit ($exit_object) |
2738 | |
2851 | |
… | |
… | |
2806 | $Coro::current->{desc} = "enter_exit"; |
2919 | $Coro::current->{desc} = "enter_exit"; |
2807 | |
2920 | |
2808 | unless (eval { |
2921 | unless (eval { |
2809 | $self->deactivate_recursive; # just to be sure |
2922 | $self->deactivate_recursive; # just to be sure |
2810 | |
2923 | |
2811 | # random map handling |
|
|
2812 | { |
|
|
2813 | my $guard = cf::lock_acquire "exit_prepare:$exit"; |
|
|
2814 | |
|
|
2815 | prepare_random_map $exit |
|
|
2816 | if $exit->slaying eq "/!"; |
|
|
2817 | } |
|
|
2818 | |
|
|
2819 | my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; |
2924 | my $map = cf::map::normalise $exit->slaying, $exit->map; |
2820 | my $x = $exit->stats->hp; |
2925 | my $x = $exit->stats->hp; |
2821 | my $y = $exit->stats->sp; |
2926 | my $y = $exit->stats->sp; |
|
|
2927 | |
|
|
2928 | # special map handling |
|
|
2929 | my $slaying = $exit->slaying; |
|
|
2930 | |
|
|
2931 | # special map handling |
|
|
2932 | if ($slaying eq "/!") { |
|
|
2933 | my $guard = cf::lock_acquire "exit_prepare:$exit"; |
|
|
2934 | |
|
|
2935 | prepare_random_map $exit |
|
|
2936 | if $exit->slaying eq "/!"; # need to re-check after getting the lock |
|
|
2937 | |
|
|
2938 | $map = $exit->slaying; |
|
|
2939 | |
|
|
2940 | } elsif ($slaying eq '!up') { |
|
|
2941 | $map = $exit->map->tile_path (cf::TILE_UP); |
|
|
2942 | $x = $exit->x; |
|
|
2943 | $y = $exit->y; |
|
|
2944 | |
|
|
2945 | } elsif ($slaying eq '!down') { |
|
|
2946 | $map = $exit->map->tile_path (cf::TILE_DOWN); |
|
|
2947 | $x = $exit->x; |
|
|
2948 | $y = $exit->y; |
|
|
2949 | } |
2822 | |
2950 | |
2823 | $self->goto ($map, $x, $y); |
2951 | $self->goto ($map, $x, $y); |
2824 | |
2952 | |
2825 | # if exit is damned, update players death & WoR home-position |
2953 | # if exit is damned, update players death & WoR home-position |
2826 | $self->contr->savebed ($map, $x, $y) |
2954 | $self->contr->savebed ($map, $x, $y) |
… | |
… | |
2831 | $self->message ("Something went wrong deep within the deliantra server. " |
2959 | $self->message ("Something went wrong deep within the deliantra server. " |
2832 | . "I'll try to bring you back to the map you were before. " |
2960 | . "I'll try to bring you back to the map you were before. " |
2833 | . "Please report this to the dungeon master!", |
2961 | . "Please report this to the dungeon master!", |
2834 | cf::NDI_UNIQUE | cf::NDI_RED); |
2962 | cf::NDI_UNIQUE | cf::NDI_RED); |
2835 | |
2963 | |
2836 | warn "ERROR in enter_exit: $@"; |
2964 | error "ERROR in enter_exit: $@"; |
2837 | $self->leave_link; |
2965 | $self->leave_link; |
2838 | } |
2966 | } |
2839 | })->prio (1); |
2967 | })->prio (1); |
2840 | } |
2968 | } |
2841 | |
2969 | |
… | |
… | |
3154 | |
3282 | |
3155 | $ns->ext_reply ($reply, @reply) |
3283 | $ns->ext_reply ($reply, @reply) |
3156 | if $reply; |
3284 | if $reply; |
3157 | |
3285 | |
3158 | } else { |
3286 | } else { |
3159 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3287 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3160 | } |
3288 | } |
3161 | |
3289 | |
3162 | cf::override; |
3290 | cf::override; |
3163 | }, |
3291 | }, |
3164 | ); |
3292 | ); |
… | |
… | |
3245 | decrease split destroy change_exp value msg lore send_msg)], |
3373 | decrease split destroy change_exp value msg lore send_msg)], |
3246 | ["cf::object::player" => qw(player)], |
3374 | ["cf::object::player" => qw(player)], |
3247 | ["cf::player" => qw(peaceful send_msg)], |
3375 | ["cf::player" => qw(peaceful send_msg)], |
3248 | ["cf::map" => qw(trigger)], |
3376 | ["cf::map" => qw(trigger)], |
3249 | ) { |
3377 | ) { |
3250 | no strict 'refs'; |
|
|
3251 | my ($pkg, @funs) = @$_; |
3378 | my ($pkg, @funs) = @$_; |
3252 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
3379 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
3253 | for @funs; |
3380 | for @funs; |
3254 | } |
3381 | } |
3255 | |
3382 | |
… | |
… | |
3294 | local @cf::_safe_eval_args = values %vars; |
3421 | local @cf::_safe_eval_args = values %vars; |
3295 | @res = wantarray ? eval eval : scalar eval $eval; |
3422 | @res = wantarray ? eval eval : scalar eval $eval; |
3296 | } |
3423 | } |
3297 | |
3424 | |
3298 | if ($@) { |
3425 | if ($@) { |
3299 | warn "$@"; |
3426 | warn "$@", |
3300 | warn "while executing safe code '$code'\n"; |
3427 | "while executing safe code '$code'\n", |
3301 | warn "with arguments " . (join " ", %vars) . "\n"; |
3428 | "with arguments " . (join " ", %vars) . "\n"; |
3302 | } |
3429 | } |
3303 | |
3430 | |
3304 | wantarray ? @res : $res[0] |
3431 | wantarray ? @res : $res[0] |
3305 | } |
3432 | } |
3306 | |
3433 | |
… | |
… | |
3340 | # for this (global event?) |
3467 | # for this (global event?) |
3341 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3468 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3342 | |
3469 | |
3343 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3470 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3344 | |
3471 | |
3345 | warn "loading facedata from $path\n"; |
3472 | trace "loading facedata from $path\n"; |
3346 | |
3473 | |
3347 | my $facedata; |
3474 | my $facedata = decode_storable load_file $path; |
3348 | 0 < aio_load $path, $facedata |
|
|
3349 | or die "$path: $!"; |
|
|
3350 | |
|
|
3351 | $facedata = Coro::Storable::thaw $facedata; |
|
|
3352 | |
3475 | |
3353 | $facedata->{version} == 2 |
3476 | $facedata->{version} == 2 |
3354 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3477 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3355 | |
3478 | |
3356 | # patch in the exptable |
3479 | # patch in the exptable |
… | |
… | |
3370 | |
3493 | |
3371 | cf::face::set_visibility $idx, $info->{visibility}; |
3494 | cf::face::set_visibility $idx, $info->{visibility}; |
3372 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3495 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3373 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3496 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3374 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
3497 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
|
|
3498 | cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; |
3375 | |
3499 | |
3376 | cf::cede_to_tick; |
3500 | cf::cede_to_tick; |
3377 | } |
3501 | } |
3378 | |
3502 | |
3379 | while (my ($face, $info) = each %$faces) { |
3503 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
3384 | |
3508 | |
3385 | if (my $smooth = cf::face::find $info->{smooth}) { |
3509 | if (my $smooth = cf::face::find $info->{smooth}) { |
3386 | cf::face::set_smooth $idx, $smooth; |
3510 | cf::face::set_smooth $idx, $smooth; |
3387 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3511 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3388 | } else { |
3512 | } else { |
3389 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
3513 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3390 | } |
3514 | } |
3391 | |
3515 | |
3392 | cf::cede_to_tick; |
3516 | cf::cede_to_tick; |
3393 | } |
3517 | } |
3394 | } |
3518 | } |
… | |
… | |
3412 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3536 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3413 | |
3537 | |
3414 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3538 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3415 | cf::face::set_type $idx, $info->{type}; |
3539 | cf::face::set_type $idx, $info->{type}; |
3416 | } else { |
3540 | } else { |
3417 | $RESOURCE{$name} = $info; |
3541 | $RESOURCE{$name} = $info; # unused |
3418 | } |
3542 | } |
3419 | |
3543 | |
3420 | cf::cede_to_tick; |
3544 | cf::cede_to_tick; |
3421 | } |
3545 | } |
3422 | } |
3546 | } |
3423 | |
3547 | |
3424 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3548 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3425 | |
3549 | |
3426 | 1 |
3550 | 1 |
3427 | } |
3551 | } |
3428 | |
|
|
3429 | cf::global->attach (on_resource_update => sub { |
|
|
3430 | if (my $soundconf = $RESOURCE{"res/sound.conf"}) { |
|
|
3431 | $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data}); |
|
|
3432 | |
|
|
3433 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
3434 | my $sound = $soundconf->{compat}[$_] |
|
|
3435 | or next; |
|
|
3436 | |
|
|
3437 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
3438 | cf::sound::set $sound->[0] => $face; |
|
|
3439 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
3440 | } |
|
|
3441 | |
|
|
3442 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
3443 | my $face = cf::face::find "sound/$v"; |
|
|
3444 | cf::sound::set $k => $face; |
|
|
3445 | } |
|
|
3446 | } |
|
|
3447 | }); |
|
|
3448 | |
3552 | |
3449 | register_exticmd fx_want => sub { |
3553 | register_exticmd fx_want => sub { |
3450 | my ($ns, $want) = @_; |
3554 | my ($ns, $want) = @_; |
3451 | |
3555 | |
3452 | while (my ($k, $v) = each %$want) { |
3556 | while (my ($k, $v) = each %$want) { |
… | |
… | |
3491 | sub reload_treasures { |
3595 | sub reload_treasures { |
3492 | load_resource_file "$DATADIR/treasures" |
3596 | load_resource_file "$DATADIR/treasures" |
3493 | or die "unable to load treasurelists\n"; |
3597 | or die "unable to load treasurelists\n"; |
3494 | } |
3598 | } |
3495 | |
3599 | |
|
|
3600 | sub reload_sound { |
|
|
3601 | trace "loading sound config from $DATADIR/sound\n"; |
|
|
3602 | |
|
|
3603 | my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound"); |
|
|
3604 | |
|
|
3605 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
3606 | my $sound = $soundconf->{compat}[$_] |
|
|
3607 | or next; |
|
|
3608 | |
|
|
3609 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
3610 | cf::sound::set $sound->[0] => $face; |
|
|
3611 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
3612 | } |
|
|
3613 | |
|
|
3614 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
3615 | my $face = cf::face::find "sound/$v"; |
|
|
3616 | cf::sound::set $k => $face; |
|
|
3617 | } |
|
|
3618 | } |
|
|
3619 | |
3496 | sub reload_resources { |
3620 | sub reload_resources { |
3497 | warn "reloading resource files...\n"; |
3621 | trace "reloading resource files...\n"; |
3498 | |
3622 | |
|
|
3623 | reload_exp_table; |
|
|
3624 | reload_materials; |
3499 | reload_facedata; |
3625 | reload_facedata; |
|
|
3626 | reload_sound; |
3500 | reload_archetypes; |
3627 | reload_archetypes; |
3501 | reload_regions; |
3628 | reload_regions; |
3502 | reload_treasures; |
3629 | reload_treasures; |
3503 | |
3630 | |
3504 | warn "finished reloading resource files\n"; |
3631 | trace "finished reloading resource files\n"; |
3505 | } |
3632 | } |
3506 | |
3633 | |
3507 | sub reload_config { |
3634 | sub reload_config { |
3508 | warn "reloading config file...\n"; |
3635 | trace "reloading config file...\n"; |
3509 | |
3636 | |
3510 | open my $fh, "<:utf8", "$CONFDIR/config" |
3637 | my $config = load_file "$CONFDIR/config"; |
3511 | or return; |
3638 | utf8::decode $config; |
|
|
3639 | *CFG = decode_yaml $config; |
3512 | |
3640 | |
3513 | local $/; |
|
|
3514 | *CFG = YAML::XS::Load scalar <$fh>; |
|
|
3515 | |
|
|
3516 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; |
3641 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3517 | |
3642 | |
3518 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3643 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3519 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3644 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3520 | |
3645 | |
3521 | if (exists $CFG{mlockall}) { |
3646 | if (exists $CFG{mlockall}) { |
… | |
… | |
3523 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3648 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3524 | and die "WARNING: m(un)lockall failed: $!\n"; |
3649 | and die "WARNING: m(un)lockall failed: $!\n"; |
3525 | }; |
3650 | }; |
3526 | warn $@ if $@; |
3651 | warn $@ if $@; |
3527 | } |
3652 | } |
3528 | |
|
|
3529 | warn "finished reloading resource files\n"; |
|
|
3530 | } |
3653 | } |
3531 | |
3654 | |
3532 | sub pidfile() { |
3655 | sub pidfile() { |
3533 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3656 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3534 | or die "$PIDFILE: $!"; |
3657 | or die "$PIDFILE: $!"; |
… | |
… | |
3547 | seek $fh, 0, 0; |
3670 | seek $fh, 0, 0; |
3548 | print $fh $$; |
3671 | print $fh $$; |
3549 | } |
3672 | } |
3550 | |
3673 | |
3551 | sub main_loop { |
3674 | sub main_loop { |
3552 | warn "EV::loop starting\n"; |
3675 | trace "EV::loop starting\n"; |
3553 | if (1) { |
3676 | if (1) { |
3554 | EV::loop; |
3677 | EV::loop; |
3555 | } |
3678 | } |
3556 | warn "EV::loop returned\n"; |
3679 | trace "EV::loop returned\n"; |
3557 | goto &main_loop unless $REALLY_UNLOOP; |
3680 | goto &main_loop unless $REALLY_UNLOOP; |
3558 | } |
3681 | } |
3559 | |
3682 | |
3560 | sub main { |
3683 | sub main { |
3561 | cf::init_globals; # initialise logging |
3684 | cf::init_globals; # initialise logging |
3562 | |
3685 | |
3563 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3686 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3564 | LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3687 | LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3565 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3688 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3566 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3689 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3567 | |
3690 | |
3568 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3691 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3569 | |
3692 | |
… | |
… | |
3577 | }; |
3700 | }; |
3578 | |
3701 | |
3579 | evthread_start IO::AIO::poll_fileno; |
3702 | evthread_start IO::AIO::poll_fileno; |
3580 | |
3703 | |
3581 | cf::sync_job { |
3704 | cf::sync_job { |
3582 | cf::init_experience; |
3705 | cf::incloader::init (); |
|
|
3706 | |
3583 | cf::init_anim; |
3707 | cf::init_anim; |
3584 | cf::init_attackmess; |
3708 | cf::init_attackmess; |
3585 | cf::init_dynamic; |
3709 | cf::init_dynamic; |
3586 | |
3710 | |
3587 | cf::load_settings; |
3711 | cf::load_settings; |
3588 | cf::load_materials; |
|
|
3589 | |
3712 | |
3590 | reload_resources; |
3713 | reload_resources; |
3591 | reload_config; |
3714 | reload_config; |
3592 | db_init; |
3715 | db_init; |
3593 | |
3716 | |
… | |
… | |
3605 | |
3728 | |
3606 | # no (long-running) fork's whatsoever before this point(!) |
3729 | # no (long-running) fork's whatsoever before this point(!) |
3607 | use POSIX (); |
3730 | use POSIX (); |
3608 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3731 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3609 | |
3732 | |
3610 | (pop @POST_INIT)->(0) while @POST_INIT; |
3733 | cf::_post_init 0; |
3611 | }; |
3734 | }; |
3612 | |
3735 | |
3613 | cf::object::thawer::errors_are_fatal 0; |
3736 | cf::object::thawer::errors_are_fatal 0; |
3614 | warn "parse errors in files are no longer fatal from this point on.\n"; |
3737 | info "parse errors in files are no longer fatal from this point on.\n"; |
3615 | |
3738 | |
|
|
3739 | my $free_main; $free_main = EV::idle sub { |
|
|
3740 | undef $free_main; |
|
|
3741 | undef &main; # free gobs of memory :) |
|
|
3742 | }; |
|
|
3743 | |
3616 | main_loop; |
3744 | goto &main_loop; |
3617 | } |
3745 | } |
3618 | |
3746 | |
3619 | ############################################################################# |
3747 | ############################################################################# |
3620 | # initialisation and cleanup |
3748 | # initialisation and cleanup |
3621 | |
3749 | |
… | |
… | |
3660 | or return; |
3788 | or return; |
3661 | |
3789 | |
3662 | aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE |
3790 | aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE |
3663 | and return; |
3791 | and return; |
3664 | |
3792 | |
3665 | warn sprintf "runtime file written (%gs).\n", AE::time - $t0; |
3793 | trace sprintf "runtime file written (%gs).\n", AE::time - $t0; |
3666 | |
3794 | |
3667 | 1 |
3795 | 1 |
3668 | } |
3796 | } |
3669 | |
3797 | |
3670 | our $uuid_lock; |
3798 | our $uuid_lock; |
… | |
… | |
3682 | or return; |
3810 | or return; |
3683 | |
3811 | |
3684 | my $value = uuid_seq uuid_cur; |
3812 | my $value = uuid_seq uuid_cur; |
3685 | |
3813 | |
3686 | unless ($value) { |
3814 | unless ($value) { |
3687 | warn "cowardly refusing to write zero uuid value!\n"; |
3815 | info "cowardly refusing to write zero uuid value!\n"; |
3688 | return; |
3816 | return; |
3689 | } |
3817 | } |
3690 | |
3818 | |
3691 | my $value = uuid_str $value + $uuid_skip; |
3819 | my $value = uuid_str $value + $uuid_skip; |
3692 | $uuid_skip = 0; |
3820 | $uuid_skip = 0; |
… | |
… | |
3702 | or return; |
3830 | or return; |
3703 | |
3831 | |
3704 | aio_rename "$uuid~", $uuid |
3832 | aio_rename "$uuid~", $uuid |
3705 | and return; |
3833 | and return; |
3706 | |
3834 | |
3707 | warn "uuid file written ($value).\n"; |
3835 | trace "uuid file written ($value).\n"; |
3708 | |
3836 | |
3709 | 1 |
3837 | 1 |
3710 | |
3838 | |
3711 | } |
3839 | } |
3712 | |
3840 | |
… | |
… | |
3718 | } |
3846 | } |
3719 | |
3847 | |
3720 | sub emergency_save() { |
3848 | sub emergency_save() { |
3721 | my $freeze_guard = cf::freeze_mainloop; |
3849 | my $freeze_guard = cf::freeze_mainloop; |
3722 | |
3850 | |
3723 | warn "emergency_perl_save: enter\n"; |
3851 | info "emergency_perl_save: enter\n"; |
|
|
3852 | |
|
|
3853 | # this is a trade-off: we want to be very quick here, so |
|
|
3854 | # save all maps without fsync, and later call a global sync |
|
|
3855 | # (which in turn might be very very slow) |
|
|
3856 | local $USE_FSYNC = 0; |
3724 | |
3857 | |
3725 | cf::sync_job { |
3858 | cf::sync_job { |
3726 | # this is a trade-off: we want to be very quick here, so |
3859 | cf::write_runtime_sync; # external watchdog should not bark |
3727 | # save all maps without fsync, and later call a global sync |
|
|
3728 | # (which in turn might be very very slow) |
|
|
3729 | local $USE_FSYNC = 0; |
|
|
3730 | |
3860 | |
3731 | # use a peculiar iteration method to avoid tripping on perl |
3861 | # use a peculiar iteration method to avoid tripping on perl |
3732 | # refcount bugs in for. also avoids problems with players |
3862 | # refcount bugs in for. also avoids problems with players |
3733 | # and maps saved/destroyed asynchronously. |
3863 | # and maps saved/destroyed asynchronously. |
3734 | warn "emergency_perl_save: begin player save\n"; |
3864 | info "emergency_perl_save: begin player save\n"; |
3735 | for my $login (keys %cf::PLAYER) { |
3865 | for my $login (keys %cf::PLAYER) { |
3736 | my $pl = $cf::PLAYER{$login} or next; |
3866 | my $pl = $cf::PLAYER{$login} or next; |
3737 | $pl->valid or next; |
3867 | $pl->valid or next; |
3738 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3868 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3739 | $pl->save; |
3869 | $pl->save; |
3740 | } |
3870 | } |
3741 | warn "emergency_perl_save: end player save\n"; |
3871 | info "emergency_perl_save: end player save\n"; |
3742 | |
3872 | |
|
|
3873 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3874 | |
3743 | warn "emergency_perl_save: begin map save\n"; |
3875 | info "emergency_perl_save: begin map save\n"; |
3744 | for my $path (keys %cf::MAP) { |
3876 | for my $path (keys %cf::MAP) { |
3745 | my $map = $cf::MAP{$path} or next; |
3877 | my $map = $cf::MAP{$path} or next; |
3746 | $map->valid or next; |
3878 | $map->valid or next; |
3747 | $map->save; |
3879 | $map->save; |
3748 | } |
3880 | } |
3749 | warn "emergency_perl_save: end map save\n"; |
3881 | info "emergency_perl_save: end map save\n"; |
3750 | |
3882 | |
|
|
3883 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3884 | |
3751 | warn "emergency_perl_save: begin database checkpoint\n"; |
3885 | info "emergency_perl_save: begin database checkpoint\n"; |
3752 | BDB::db_env_txn_checkpoint $DB_ENV; |
3886 | BDB::db_env_txn_checkpoint $DB_ENV; |
3753 | warn "emergency_perl_save: end database checkpoint\n"; |
3887 | info "emergency_perl_save: end database checkpoint\n"; |
3754 | |
3888 | |
3755 | warn "emergency_perl_save: begin write uuid\n"; |
3889 | info "emergency_perl_save: begin write uuid\n"; |
3756 | write_uuid_sync 1; |
3890 | write_uuid_sync 1; |
3757 | warn "emergency_perl_save: end write uuid\n"; |
3891 | info "emergency_perl_save: end write uuid\n"; |
|
|
3892 | |
|
|
3893 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3894 | |
|
|
3895 | trace "emergency_perl_save: syncing database to disk"; |
|
|
3896 | BDB::db_env_txn_checkpoint $DB_ENV; |
|
|
3897 | |
|
|
3898 | info "emergency_perl_save: starting sync\n"; |
|
|
3899 | IO::AIO::aio_sync sub { |
|
|
3900 | info "emergency_perl_save: finished sync\n"; |
|
|
3901 | }; |
|
|
3902 | |
|
|
3903 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3904 | |
|
|
3905 | trace "emergency_perl_save: flushing outstanding aio requests"; |
|
|
3906 | while (IO::AIO::nreqs || BDB::nreqs) { |
|
|
3907 | Coro::EV::timer_once 0.01; # let the sync_job do it's thing |
|
|
3908 | } |
|
|
3909 | |
|
|
3910 | cf::write_runtime_sync; # external watchdog should not bark |
3758 | }; |
3911 | }; |
3759 | |
3912 | |
3760 | warn "emergency_perl_save: starting sync()\n"; |
|
|
3761 | IO::AIO::aio_sync sub { |
|
|
3762 | warn "emergency_perl_save: finished sync()\n"; |
|
|
3763 | }; |
|
|
3764 | |
|
|
3765 | warn "emergency_perl_save: leave\n"; |
3913 | info "emergency_perl_save: leave\n"; |
3766 | } |
3914 | } |
3767 | |
3915 | |
3768 | sub post_cleanup { |
3916 | sub post_cleanup { |
3769 | my ($make_core) = @_; |
3917 | my ($make_core) = @_; |
3770 | |
3918 | |
|
|
3919 | IO::AIO::flush; |
|
|
3920 | |
3771 | warn Carp::longmess "post_cleanup backtrace" |
3921 | error Carp::longmess "post_cleanup backtrace" |
3772 | if $make_core; |
3922 | if $make_core; |
3773 | |
3923 | |
3774 | my $fh = pidfile; |
3924 | my $fh = pidfile; |
3775 | unlink $PIDFILE if <$fh> == $$; |
3925 | unlink $PIDFILE if <$fh> == $$; |
3776 | } |
3926 | } |
… | |
… | |
3800 | } |
3950 | } |
3801 | } |
3951 | } |
3802 | |
3952 | |
3803 | sub do_reload_perl() { |
3953 | sub do_reload_perl() { |
3804 | # can/must only be called in main |
3954 | # can/must only be called in main |
3805 | if (in_main) { |
3955 | unless (in_main) { |
3806 | warn "can only reload from main coroutine"; |
3956 | error "can only reload from main coroutine"; |
3807 | return; |
3957 | return; |
3808 | } |
3958 | } |
3809 | |
3959 | |
3810 | return if $RELOAD++; |
3960 | return if $RELOAD++; |
3811 | |
3961 | |
3812 | my $t1 = AE::time; |
3962 | my $t1 = AE::time; |
3813 | |
3963 | |
3814 | while ($RELOAD) { |
3964 | while ($RELOAD) { |
3815 | warn "reloading..."; |
3965 | cf::get_slot 0.1, -1, "reload_perl"; |
|
|
3966 | info "perl_reload: reloading..."; |
3816 | |
3967 | |
3817 | warn "entering sync_job"; |
3968 | trace "perl_reload: entering sync_job"; |
3818 | |
3969 | |
3819 | cf::sync_job { |
3970 | cf::sync_job { |
3820 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3821 | cf::emergency_save; |
3971 | #cf::emergency_save; |
3822 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3823 | |
3972 | |
3824 | warn "syncing database to disk"; |
|
|
3825 | BDB::db_env_txn_checkpoint $DB_ENV; |
|
|
3826 | |
|
|
3827 | # if anything goes wrong in here, we should simply crash as we already saved |
|
|
3828 | |
|
|
3829 | warn "flushing outstanding aio requests"; |
|
|
3830 | while (IO::AIO::nreqs || BDB::nreqs) { |
|
|
3831 | Coro::EV::timer_once 0.01; # let the sync_job do it's thing |
|
|
3832 | } |
|
|
3833 | |
|
|
3834 | warn "cancelling all extension coros"; |
3973 | trace "perl_reload: cancelling all extension coros"; |
3835 | $_->cancel for values %EXT_CORO; |
3974 | $_->cancel for values %EXT_CORO; |
3836 | %EXT_CORO = (); |
3975 | %EXT_CORO = (); |
3837 | |
3976 | |
3838 | warn "removing commands"; |
3977 | trace "perl_reload: removing commands"; |
3839 | %COMMAND = (); |
3978 | %COMMAND = (); |
3840 | |
3979 | |
3841 | warn "removing ext/exti commands"; |
3980 | trace "perl_reload: removing ext/exti commands"; |
3842 | %EXTCMD = (); |
3981 | %EXTCMD = (); |
3843 | %EXTICMD = (); |
3982 | %EXTICMD = (); |
3844 | |
3983 | |
3845 | warn "unloading/nuking all extensions"; |
3984 | trace "perl_reload: unloading/nuking all extensions"; |
3846 | for my $pkg (@EXTS) { |
3985 | for my $pkg (@EXTS) { |
3847 | warn "... unloading $pkg"; |
3986 | trace "... unloading $pkg"; |
3848 | |
3987 | |
3849 | if (my $cb = $pkg->can ("unload")) { |
3988 | if (my $cb = $pkg->can ("unload")) { |
3850 | eval { |
3989 | eval { |
3851 | $cb->($pkg); |
3990 | $cb->($pkg); |
3852 | 1 |
3991 | 1 |
3853 | } or warn "$pkg unloaded, but with errors: $@"; |
3992 | } or error "$pkg unloaded, but with errors: $@"; |
3854 | } |
3993 | } |
3855 | |
3994 | |
3856 | warn "... clearing $pkg"; |
3995 | trace "... clearing $pkg"; |
3857 | clear_package $pkg; |
3996 | clear_package $pkg; |
3858 | } |
3997 | } |
3859 | |
3998 | |
3860 | warn "unloading all perl modules loaded from $LIBDIR"; |
3999 | trace "perl_reload: unloading all perl modules loaded from $LIBDIR"; |
3861 | while (my ($k, $v) = each %INC) { |
4000 | while (my ($k, $v) = each %INC) { |
3862 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
4001 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3863 | |
4002 | |
3864 | warn "... unloading $k"; |
4003 | trace "... unloading $k"; |
3865 | delete $INC{$k}; |
4004 | delete $INC{$k}; |
3866 | |
4005 | |
3867 | $k =~ s/\.pm$//; |
4006 | $k =~ s/\.pm$//; |
3868 | $k =~ s/\//::/g; |
4007 | $k =~ s/\//::/g; |
3869 | |
4008 | |
… | |
… | |
3872 | } |
4011 | } |
3873 | |
4012 | |
3874 | clear_package $k; |
4013 | clear_package $k; |
3875 | } |
4014 | } |
3876 | |
4015 | |
3877 | warn "getting rid of safe::, as good as possible"; |
4016 | trace "perl_reload: getting rid of safe::, as good as possible"; |
3878 | clear_package "safe::$_" |
4017 | clear_package "safe::$_" |
3879 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
4018 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3880 | |
4019 | |
3881 | warn "unloading cf.pm \"a bit\""; |
4020 | trace "perl_reload: unloading cf.pm \"a bit\""; |
3882 | delete $INC{"cf.pm"}; |
4021 | delete $INC{"cf.pm"}; |
3883 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
4022 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3884 | |
4023 | |
3885 | # don't, removes xs symbols, too, |
4024 | # don't, removes xs symbols, too, |
3886 | # and global variables created in xs |
4025 | # and global variables created in xs |
3887 | #clear_package __PACKAGE__; |
4026 | #clear_package __PACKAGE__; |
3888 | |
4027 | |
3889 | warn "unload completed, starting to reload now"; |
4028 | info "perl_reload: unload completed, starting to reload now"; |
3890 | |
4029 | |
3891 | warn "reloading cf.pm"; |
4030 | trace "perl_reload: reloading cf.pm"; |
3892 | require cf; |
4031 | require cf; |
3893 | cf::_connect_to_perl_1; |
4032 | cf::_connect_to_perl_1; |
3894 | |
4033 | |
3895 | warn "loading config and database again"; |
4034 | trace "perl_reload: loading config and database again"; |
3896 | cf::reload_config; |
4035 | cf::reload_config; |
3897 | |
4036 | |
3898 | warn "loading extensions"; |
4037 | trace "perl_reload: loading extensions"; |
3899 | cf::load_extensions; |
4038 | cf::load_extensions; |
3900 | |
4039 | |
3901 | if ($REATTACH_ON_RELOAD) { |
4040 | if ($REATTACH_ON_RELOAD) { |
3902 | warn "reattaching attachments to objects/players"; |
4041 | trace "perl_reload: reattaching attachments to objects/players"; |
3903 | _global_reattach; # objects, sockets |
4042 | _global_reattach; # objects, sockets |
3904 | warn "reattaching attachments to maps"; |
4043 | trace "perl_reload: reattaching attachments to maps"; |
3905 | reattach $_ for values %MAP; |
4044 | reattach $_ for values %MAP; |
3906 | warn "reattaching attachments to players"; |
4045 | trace "perl_reload: reattaching attachments to players"; |
3907 | reattach $_ for values %PLAYER; |
4046 | reattach $_ for values %PLAYER; |
3908 | } |
4047 | } |
3909 | |
4048 | |
3910 | warn "running post_init jobs"; |
4049 | cf::_post_init 1; |
3911 | (pop @POST_INIT)->(1) while @POST_INIT; |
|
|
3912 | |
4050 | |
3913 | warn "leaving sync_job"; |
4051 | trace "perl_reload: leaving sync_job"; |
3914 | |
4052 | |
3915 | 1 |
4053 | 1 |
3916 | } or do { |
4054 | } or do { |
3917 | warn $@; |
4055 | error $@; |
3918 | cf::cleanup "error while reloading, exiting."; |
4056 | cf::cleanup "perl_reload: error, exiting."; |
3919 | }; |
4057 | }; |
3920 | |
4058 | |
3921 | warn "reloaded"; |
|
|
3922 | --$RELOAD; |
4059 | --$RELOAD; |
3923 | } |
4060 | } |
3924 | |
4061 | |
3925 | $t1 = AE::time - $t1; |
4062 | $t1 = AE::time - $t1; |
3926 | warn "reload completed in ${t1}s\n"; |
4063 | info "perl_reload: completed in ${t1}s\n"; |
3927 | }; |
4064 | }; |
3928 | |
4065 | |
3929 | our $RELOAD_WATCHER; # used only during reload |
4066 | our $RELOAD_WATCHER; # used only during reload |
3930 | |
4067 | |
3931 | sub reload_perl() { |
4068 | sub reload_perl() { |
… | |
… | |
3952 | reload_perl; |
4089 | reload_perl; |
3953 | }; |
4090 | }; |
3954 | } |
4091 | } |
3955 | }; |
4092 | }; |
3956 | |
4093 | |
3957 | unshift @INC, $LIBDIR; |
4094 | ############################################################################# |
3958 | |
4095 | |
3959 | my $bug_warning = 0; |
4096 | my $bug_warning = 0; |
3960 | |
4097 | |
3961 | our @WAIT_FOR_TICK; |
4098 | our @WAIT_FOR_TICK; |
3962 | our @WAIT_FOR_TICK_BEGIN; |
4099 | our @WAIT_FOR_TICK_BEGIN; |
3963 | |
4100 | |
3964 | sub wait_for_tick { |
4101 | sub wait_for_tick() { |
3965 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4102 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
3966 | |
4103 | |
3967 | my $signal = new Coro::Signal; |
4104 | my $signal = new Coro::Signal; |
3968 | push @WAIT_FOR_TICK, $signal; |
4105 | push @WAIT_FOR_TICK, $signal; |
3969 | $signal->wait; |
4106 | $signal->wait; |
3970 | } |
4107 | } |
3971 | |
4108 | |
3972 | sub wait_for_tick_begin { |
4109 | sub wait_for_tick_begin() { |
3973 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4110 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
3974 | |
4111 | |
3975 | my $signal = new Coro::Signal; |
4112 | my $signal = new Coro::Signal; |
3976 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4113 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3977 | $signal->wait; |
4114 | $signal->wait; |
… | |
… | |
3991 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
4128 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3992 | $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; |
4129 | $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; |
3993 | Coro::async_pool { |
4130 | Coro::async_pool { |
3994 | $Coro::current->{desc} = "runtime saver"; |
4131 | $Coro::current->{desc} = "runtime saver"; |
3995 | write_runtime_sync |
4132 | write_runtime_sync |
3996 | or warn "ERROR: unable to write runtime file: $!"; |
4133 | or error "ERROR: unable to write runtime file: $!"; |
3997 | }; |
4134 | }; |
3998 | } |
4135 | } |
3999 | |
4136 | |
4000 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
4137 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
4001 | $sig->send; |
4138 | $sig->send; |
… | |
… | |
4009 | |
4146 | |
4010 | if (0) { |
4147 | if (0) { |
4011 | if ($NEXT_TICK) { |
4148 | if ($NEXT_TICK) { |
4012 | my $jitter = $TICK_START - $NEXT_TICK; |
4149 | my $jitter = $TICK_START - $NEXT_TICK; |
4013 | $JITTER = $JITTER * 0.75 + $jitter * 0.25; |
4150 | $JITTER = $JITTER * 0.75 + $jitter * 0.25; |
4014 | warn "jitter $JITTER\n";#d# |
4151 | debug "jitter $JITTER\n";#d# |
4015 | } |
4152 | } |
4016 | } |
4153 | } |
4017 | } |
4154 | } |
4018 | |
4155 | |
4019 | { |
4156 | { |
… | |
… | |
4064 | IO::AIO::min_parallel 8; |
4201 | IO::AIO::min_parallel 8; |
4065 | IO::AIO::max_poll_time $TICK * 0.1; |
4202 | IO::AIO::max_poll_time $TICK * 0.1; |
4066 | undef $AnyEvent::AIO::WATCHER; |
4203 | undef $AnyEvent::AIO::WATCHER; |
4067 | } |
4204 | } |
4068 | |
4205 | |
4069 | my $_log_backtrace; |
4206 | our $_log_backtrace; |
|
|
4207 | our $_log_backtrace_last; |
4070 | |
4208 | |
4071 | sub _log_backtrace { |
4209 | sub _log_backtrace { |
4072 | my ($msg, @addr) = @_; |
4210 | my ($msg, @addr) = @_; |
4073 | |
4211 | |
4074 | $msg =~ s/\n//; |
4212 | $msg =~ s/\n$//; |
4075 | |
4213 | |
|
|
4214 | if ($_log_backtrace_last eq $msg) { |
|
|
4215 | LOG llevInfo, "[ABT] $msg\n"; |
|
|
4216 | LOG llevInfo, "[ABT] [duplicate, suppressed]\n"; |
4076 | # limit the # of concurrent backtraces |
4217 | # limit the # of concurrent backtraces |
4077 | if ($_log_backtrace < 2) { |
4218 | } elsif ($_log_backtrace < 2) { |
|
|
4219 | $_log_backtrace_last = $msg; |
4078 | ++$_log_backtrace; |
4220 | ++$_log_backtrace; |
4079 | my $perl_bt = Carp::longmess $msg; |
4221 | my $perl_bt = Carp::longmess $msg; |
4080 | async { |
4222 | async { |
4081 | $Coro::current->{desc} = "abt $msg"; |
4223 | $Coro::current->{desc} = "abt $msg"; |
4082 | |
4224 | |
… | |
… | |
4102 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4244 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4103 | --$_log_backtrace; |
4245 | --$_log_backtrace; |
4104 | }; |
4246 | }; |
4105 | } else { |
4247 | } else { |
4106 | LOG llevInfo, "[ABT] $msg\n"; |
4248 | LOG llevInfo, "[ABT] $msg\n"; |
4107 | LOG llevInfo, "[ABT] [suppressed]\n"; |
4249 | LOG llevInfo, "[ABT] [overload, suppressed]\n"; |
4108 | } |
4250 | } |
4109 | } |
4251 | } |
4110 | |
4252 | |
4111 | # load additional modules |
4253 | # load additional modules |
4112 | require "cf/$_.pm" for @EXTRA_MODULES; |
4254 | require "cf/$_.pm" for @EXTRA_MODULES; |