… | |
… | |
124 | our $BDB_DEADLOCK_WATCHER; |
124 | our $BDB_DEADLOCK_WATCHER; |
125 | our $BDB_CHECKPOINT_WATCHER; |
125 | our $BDB_CHECKPOINT_WATCHER; |
126 | our $BDB_TRICKLE_WATCHER; |
126 | our $BDB_TRICKLE_WATCHER; |
127 | our $DB_ENV; |
127 | our $DB_ENV; |
128 | |
128 | |
129 | our @EXTRA_MODULES = qw(pod match mapscript); |
129 | our @EXTRA_MODULES = qw(pod match mapscript incloader); |
130 | |
130 | |
131 | our %CFG; |
131 | our %CFG; |
132 | |
132 | |
133 | our $UPTIME; $UPTIME ||= time; |
133 | our $UPTIME; $UPTIME ||= time; |
134 | our $RUNTIME; |
134 | our $RUNTIME; |
… | |
… | |
233 | from wherever your confdir points to. |
233 | from wherever your confdir points to. |
234 | |
234 | |
235 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
235 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
236 | |
236 | |
237 | 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 |
238 | 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 |
239 | 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(); |
240 | |
245 | |
241 | =item @cf::INVOKE_RESULTS |
246 | =item @cf::INVOKE_RESULTS |
242 | |
247 | |
243 | 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 |
244 | 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 |
… | |
… | |
352 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
357 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
353 | |
358 | |
354 | sub encode_json($) { $json_coder->encode ($_[0]) } |
359 | sub encode_json($) { $json_coder->encode ($_[0]) } |
355 | sub decode_json($) { $json_coder->decode ($_[0]) } |
360 | sub decode_json($) { $json_coder->decode ($_[0]) } |
356 | |
361 | |
|
|
362 | =item $ref = cf::yaml_load $scalar |
|
|
363 | |
|
|
364 | Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). |
|
|
365 | |
|
|
366 | =cut |
|
|
367 | |
|
|
368 | sub fork_call(&@); |
|
|
369 | |
|
|
370 | sub yaml_load($) { |
|
|
371 | fork_call { YAML::XS::Load $_[0] } @_ |
|
|
372 | } |
|
|
373 | |
357 | =item cf::post_init { BLOCK } |
374 | =item cf::post_init { BLOCK } |
358 | |
375 | |
359 | Execute the given codeblock, I<after> all extensions have been (re-)loaded, |
376 | Execute the given codeblock, I<after> all extensions have been (re-)loaded, |
360 | but I<before> the server starts ticking again. |
377 | but I<before> the server starts ticking again. |
361 | |
378 | |
362 | The cdoeblock will have a single boolean argument to indicate whether this |
379 | The codeblock will have a single boolean argument to indicate whether this |
363 | is a reload or not. |
380 | is a reload or not. |
364 | |
381 | |
365 | =cut |
382 | =cut |
366 | |
383 | |
367 | sub post_init(&) { |
384 | sub post_init(&) { |
368 | push @POST_INIT, shift; |
385 | push @POST_INIT, shift; |
|
|
386 | } |
|
|
387 | |
|
|
388 | sub _post_init { |
|
|
389 | trace "running post_init jobs"; |
|
|
390 | |
|
|
391 | # run them in parallel... |
|
|
392 | |
|
|
393 | my @join; |
|
|
394 | |
|
|
395 | while () { |
|
|
396 | push @join, map &Coro::async ($_, 0), @POST_INIT; |
|
|
397 | @POST_INIT = (); |
|
|
398 | |
|
|
399 | @join or last; |
|
|
400 | |
|
|
401 | (pop @join)->join; |
|
|
402 | } |
369 | } |
403 | } |
370 | |
404 | |
371 | =item cf::lock_wait $string |
405 | =item cf::lock_wait $string |
372 | |
406 | |
373 | Wait until the given lock is available. See cf::lock_acquire. |
407 | Wait until the given lock is available. See cf::lock_acquire. |
… | |
… | |
578 | $EXT_CORO{$coro+0} = $coro; |
612 | $EXT_CORO{$coro+0} = $coro; |
579 | |
613 | |
580 | $coro |
614 | $coro |
581 | } |
615 | } |
582 | |
616 | |
583 | =item fork_call { }, $args |
617 | =item fork_call { }, @args |
584 | |
618 | |
585 | Executes the given code block with the given arguments in a seperate |
619 | Executes the given code block with the given arguments in a seperate |
586 | process, returning the results. Everything must be serialisable with |
620 | process, returning the results. Everything must be serialisable with |
587 | Coro::Storable. May, of course, block. Note that the executed sub may |
621 | Coro::Storable. May, of course, block. Note that the executed sub may |
588 | never block itself or use any form of event handling. |
622 | never block itself or use any form of event handling. |
589 | |
623 | |
590 | =cut |
624 | =cut |
591 | |
625 | |
|
|
626 | sub post_fork { |
|
|
627 | reset_signals; |
|
|
628 | } |
|
|
629 | |
592 | sub fork_call(&@) { |
630 | sub fork_call(&@) { |
593 | my ($cb, @args) = @_; |
631 | my ($cb, @args) = @_; |
594 | |
632 | |
595 | # we seemingly have to make a local copy of the whole thing, |
633 | # we seemingly have to make a local copy of the whole thing, |
596 | # otherwise perl prematurely frees the stuff :/ |
634 | # otherwise perl prematurely frees the stuff :/ |
597 | # TODO: investigate and fix (likely this will be rather laborious) |
635 | # TODO: investigate and fix (likely this will be rather laborious) |
598 | |
636 | |
599 | my @res = Coro::Util::fork_eval { |
637 | my @res = Coro::Util::fork_eval { |
600 | reset_signals; |
638 | cf::post_fork; |
601 | &$cb |
639 | &$cb |
602 | }, @args; |
640 | } @args; |
603 | |
641 | |
604 | wantarray ? @res : $res[-1] |
642 | wantarray ? @res : $res[-1] |
605 | } |
643 | } |
606 | |
644 | |
607 | sub objinfo { |
645 | sub objinfo { |
… | |
… | |
1451 | |
1489 | |
1452 | my $active = eval $v->{source}; |
1490 | my $active = eval $v->{source}; |
1453 | |
1491 | |
1454 | if (length $@) { |
1492 | if (length $@) { |
1455 | error "$v->{path}: $@\n"; |
1493 | error "$v->{path}: $@\n"; |
1456 | undef $@; # work around perl 5.10.0 utf-8 caching bug |
|
|
1457 | |
1494 | |
1458 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1495 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1459 | if exists $v->{meta}{mandatory}; |
1496 | if exists $v->{meta}{mandatory}; |
1460 | |
1497 | |
1461 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
1498 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
… | |
… | |
1642 | my $name = $pl->ob->name; |
1679 | my $name = $pl->ob->name; |
1643 | |
1680 | |
1644 | $pl->{deny_save} = 1; |
1681 | $pl->{deny_save} = 1; |
1645 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1682 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1646 | |
1683 | |
1647 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1684 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns; |
1648 | $pl->deactivate; |
1685 | $pl->deactivate; |
|
|
1686 | |
1649 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1687 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1650 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1688 | $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns; |
|
|
1689 | ext::highscore::check ($pl->ob); |
|
|
1690 | |
1651 | $pl->ns->destroy if $pl->ns; |
1691 | $pl->ns->destroy if $pl->ns; |
1652 | |
1692 | |
1653 | my $path = playerdir $pl; |
1693 | my $path = playerdir $pl; |
1654 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1694 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1655 | aio_rename $path, $temp; |
1695 | aio_rename $path, $temp; |
… | |
… | |
1870 | } |
1910 | } |
1871 | |
1911 | |
1872 | sub normalise { |
1912 | sub normalise { |
1873 | my ($path, $base) = @_; |
1913 | my ($path, $base) = @_; |
1874 | |
1914 | |
1875 | $path = "$path"; # make sure its a string |
1915 | $path = "$path"; # make sure it's a string |
1876 | |
1916 | |
1877 | $path =~ s/\.map$//; |
1917 | $path =~ s/\.map$//; |
1878 | |
1918 | |
1879 | # map plan: |
1919 | # map plan: |
1880 | # |
1920 | # |
… | |
… | |
1895 | $base =~ s{[^/]+/?$}{}; |
1935 | $base =~ s{[^/]+/?$}{}; |
1896 | $path = "$base/$path"; |
1936 | $path = "$base/$path"; |
1897 | } |
1937 | } |
1898 | |
1938 | |
1899 | for ($path) { |
1939 | for ($path) { |
1900 | redo if s{//}{/}; |
|
|
1901 | redo if s{/\.?/}{/}; |
1940 | redo if s{/\.?/}{/}; |
1902 | redo if s{/[^/]+/\.\./}{/}; |
1941 | redo if s{/[^/]+/\.\./}{/}; |
1903 | } |
1942 | } |
1904 | |
1943 | |
1905 | $path |
1944 | $path |
… | |
… | |
1919 | $self->init; # pass $1 etc. |
1958 | $self->init; # pass $1 etc. |
1920 | return $self; |
1959 | return $self; |
1921 | } |
1960 | } |
1922 | } |
1961 | } |
1923 | |
1962 | |
1924 | Carp::cluck "unable to resolve path '$path' (base '$base')."; |
1963 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
1925 | () |
1964 | () |
1926 | } |
1965 | } |
1927 | |
1966 | |
1928 | sub init { |
1967 | sub init { |
1929 | my ($self) = @_; |
1968 | my ($self) = @_; |
… | |
… | |
2051 | } |
2090 | } |
2052 | |
2091 | |
2053 | sub find; |
2092 | sub find; |
2054 | sub find { |
2093 | sub find { |
2055 | my ($path, $origin) = @_; |
2094 | my ($path, $origin) = @_; |
|
|
2095 | |
|
|
2096 | cf::cede_to_tick; |
2056 | |
2097 | |
2057 | $path = normalise $path, $origin && $origin->path; |
2098 | $path = normalise $path, $origin && $origin->path; |
2058 | |
2099 | |
2059 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2100 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2060 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2101 | my $guard2 = cf::lock_acquire "map_find:$path"; |
… | |
… | |
2145 | |
2186 | |
2146 | $self->in_memory (cf::MAP_ACTIVE); |
2187 | $self->in_memory (cf::MAP_ACTIVE); |
2147 | } |
2188 | } |
2148 | |
2189 | |
2149 | $self->post_load; |
2190 | $self->post_load; |
|
|
2191 | |
|
|
2192 | 1 |
2150 | } |
2193 | } |
2151 | |
2194 | |
2152 | # customize the map for a given player, i.e. |
2195 | # customize the map for a given player, i.e. |
2153 | # return the _real_ map. used by e.g. per-player |
2196 | # return the _real_ map. used by e.g. per-player |
2154 | # maps to change the path to ~playername/mappath |
2197 | # maps to change the path to ~playername/mappath |
… | |
… | |
3358 | =cut |
3401 | =cut |
3359 | |
3402 | |
3360 | ############################################################################# |
3403 | ############################################################################# |
3361 | # the server's init and main functions |
3404 | # the server's init and main functions |
3362 | |
3405 | |
3363 | # async inc loader. yay. |
|
|
3364 | sub inc_loader { |
|
|
3365 | my $mod = $_[1]; |
|
|
3366 | |
|
|
3367 | if (in_main && !tick_inhibit) { |
|
|
3368 | Carp::cluck "ERROR: attempted synchronous perl module load ($mod)"; |
|
|
3369 | } else { |
|
|
3370 | debug "loading perl module $mod\n"; |
|
|
3371 | } |
|
|
3372 | |
|
|
3373 | # 1. find real file |
|
|
3374 | for my $dir (@ORIG_INC) { |
|
|
3375 | warn "$dir/$mod\n";#d# |
|
|
3376 | ref $dir and next; |
|
|
3377 | 0 <= Coro::AIO::aio_load "$dir/$mod", my $data |
|
|
3378 | or next; |
|
|
3379 | |
|
|
3380 | $data = "#line 1 $dir/$mod\n$data"; |
|
|
3381 | |
|
|
3382 | open my $fh, "<", \$data or die; |
|
|
3383 | |
|
|
3384 | return $fh; |
|
|
3385 | } |
|
|
3386 | |
|
|
3387 | () |
|
|
3388 | } |
|
|
3389 | |
|
|
3390 | sub init_inc { |
|
|
3391 | # save original @INC |
|
|
3392 | @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC; |
|
|
3393 | |
|
|
3394 | # make sure we can do scalar-opens |
|
|
3395 | open my $dummy, "<", \my $dummy2; |
|
|
3396 | |
|
|
3397 | # execute some stuff so perl load's some of the core modules |
|
|
3398 | /Ü/ =~ /ü/i; |
|
|
3399 | eval { &Storable::nstore_fd }; |
|
|
3400 | |
|
|
3401 | @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc. |
|
|
3402 | |
|
|
3403 | debug "module loading will be asynchronous from this point on."; |
|
|
3404 | } |
|
|
3405 | |
|
|
3406 | sub load_facedata($) { |
3406 | sub load_facedata($) { |
3407 | my ($path) = @_; |
3407 | my ($path) = @_; |
3408 | |
3408 | |
3409 | # HACK to clear player env face cache, we need some signal framework |
3409 | # HACK to clear player env face cache, we need some signal framework |
3410 | # for this (global event?) |
3410 | # for this (global event?) |
… | |
… | |
3412 | |
3412 | |
3413 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3413 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3414 | |
3414 | |
3415 | trace "loading facedata from $path\n"; |
3415 | trace "loading facedata from $path\n"; |
3416 | |
3416 | |
3417 | my $facedata; |
|
|
3418 | 0 < aio_load $path, $facedata |
3417 | 0 < aio_load $path, my $facedata |
3419 | or die "$path: $!"; |
3418 | or die "$path: $!"; |
3420 | |
3419 | |
3421 | $facedata = Coro::Storable::thaw $facedata; |
3420 | $facedata = Coro::Storable::thaw $facedata; |
3422 | |
3421 | |
3423 | $facedata->{version} == 2 |
3422 | $facedata->{version} == 2 |
… | |
… | |
3567 | } |
3566 | } |
3568 | |
3567 | |
3569 | sub reload_resources { |
3568 | sub reload_resources { |
3570 | trace "reloading resource files...\n"; |
3569 | trace "reloading resource files...\n"; |
3571 | |
3570 | |
|
|
3571 | reload_exp_table; |
|
|
3572 | reload_materials; |
3572 | reload_facedata; |
3573 | reload_facedata; |
3573 | reload_sound; |
3574 | reload_sound; |
3574 | reload_archetypes; |
3575 | reload_archetypes; |
3575 | reload_regions; |
3576 | reload_regions; |
3576 | reload_treasures; |
3577 | reload_treasures; |
… | |
… | |
3579 | } |
3580 | } |
3580 | |
3581 | |
3581 | sub reload_config { |
3582 | sub reload_config { |
3582 | trace "reloading config file...\n"; |
3583 | trace "reloading config file...\n"; |
3583 | |
3584 | |
3584 | open my $fh, "<:utf8", "$CONFDIR/config" |
3585 | 0 < aio_load "$CONFDIR/config", my $config |
3585 | or return; |
3586 | or die "$CONFDIR/config: $!"; |
3586 | |
3587 | |
3587 | local $/; |
3588 | utf8::decode $config; |
3588 | *CFG = YAML::XS::Load scalar <$fh>; |
3589 | *CFG = yaml_load $config; |
3589 | |
3590 | |
3590 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3591 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3591 | |
3592 | |
3592 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3593 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3593 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3594 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
… | |
… | |
3597 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3598 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3598 | and die "WARNING: m(un)lockall failed: $!\n"; |
3599 | and die "WARNING: m(un)lockall failed: $!\n"; |
3599 | }; |
3600 | }; |
3600 | warn $@ if $@; |
3601 | warn $@ if $@; |
3601 | } |
3602 | } |
3602 | |
|
|
3603 | trace "finished reloading resource files\n"; |
|
|
3604 | } |
3603 | } |
3605 | |
3604 | |
3606 | sub pidfile() { |
3605 | sub pidfile() { |
3607 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3606 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3608 | or die "$PIDFILE: $!"; |
3607 | or die "$PIDFILE: $!"; |
… | |
… | |
3651 | }; |
3650 | }; |
3652 | |
3651 | |
3653 | evthread_start IO::AIO::poll_fileno; |
3652 | evthread_start IO::AIO::poll_fileno; |
3654 | |
3653 | |
3655 | cf::sync_job { |
3654 | cf::sync_job { |
3656 | init_inc; |
3655 | cf::incloader::init (); |
3657 | |
3656 | |
3658 | cf::init_experience; |
|
|
3659 | cf::init_anim; |
3657 | cf::init_anim; |
3660 | cf::init_attackmess; |
3658 | cf::init_attackmess; |
3661 | cf::init_dynamic; |
3659 | cf::init_dynamic; |
3662 | |
3660 | |
3663 | cf::load_settings; |
3661 | cf::load_settings; |
3664 | cf::load_materials; |
|
|
3665 | |
3662 | |
3666 | reload_resources; |
3663 | reload_resources; |
3667 | reload_config; |
3664 | reload_config; |
3668 | db_init; |
3665 | db_init; |
3669 | |
3666 | |
… | |
… | |
3681 | |
3678 | |
3682 | # no (long-running) fork's whatsoever before this point(!) |
3679 | # no (long-running) fork's whatsoever before this point(!) |
3683 | use POSIX (); |
3680 | use POSIX (); |
3684 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3681 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3685 | |
3682 | |
3686 | (pop @POST_INIT)->(0) while @POST_INIT; |
3683 | cf::_post_init 0; |
3687 | }; |
3684 | }; |
3688 | |
3685 | |
3689 | cf::object::thawer::errors_are_fatal 0; |
3686 | cf::object::thawer::errors_are_fatal 0; |
3690 | info "parse errors in files are no longer fatal from this point on.\n"; |
3687 | info "parse errors in files are no longer fatal from this point on.\n"; |
3691 | |
3688 | |
… | |
… | |
3903 | } |
3900 | } |
3904 | } |
3901 | } |
3905 | |
3902 | |
3906 | sub do_reload_perl() { |
3903 | sub do_reload_perl() { |
3907 | # can/must only be called in main |
3904 | # can/must only be called in main |
3908 | if (in_main) { |
3905 | unless (in_main) { |
3909 | error "can only reload from main coroutine"; |
3906 | error "can only reload from main coroutine"; |
3910 | return; |
3907 | return; |
3911 | } |
3908 | } |
3912 | |
3909 | |
3913 | return if $RELOAD++; |
3910 | return if $RELOAD++; |
3914 | |
3911 | |
3915 | my $t1 = AE::time; |
3912 | my $t1 = AE::time; |
3916 | |
3913 | |
3917 | while ($RELOAD) { |
3914 | while ($RELOAD) { |
|
|
3915 | cf::get_slot 0.1, -1, "reload_perl"; |
3918 | info "reloading..."; |
3916 | info "perl_reload: reloading..."; |
3919 | |
3917 | |
3920 | trace "entering sync_job"; |
3918 | trace "perl_reload: entering sync_job"; |
3921 | |
3919 | |
3922 | cf::sync_job { |
3920 | cf::sync_job { |
3923 | cf::emergency_save; |
3921 | #cf::emergency_save; |
3924 | |
3922 | |
3925 | trace "cancelling all extension coros"; |
3923 | trace "perl_reload: cancelling all extension coros"; |
3926 | $_->cancel for values %EXT_CORO; |
3924 | $_->cancel for values %EXT_CORO; |
3927 | %EXT_CORO = (); |
3925 | %EXT_CORO = (); |
3928 | |
3926 | |
3929 | trace "removing commands"; |
3927 | trace "perl_reload: removing commands"; |
3930 | %COMMAND = (); |
3928 | %COMMAND = (); |
3931 | |
3929 | |
3932 | trace "removing ext/exti commands"; |
3930 | trace "perl_reload: removing ext/exti commands"; |
3933 | %EXTCMD = (); |
3931 | %EXTCMD = (); |
3934 | %EXTICMD = (); |
3932 | %EXTICMD = (); |
3935 | |
3933 | |
3936 | trace "unloading/nuking all extensions"; |
3934 | trace "perl_reload: unloading/nuking all extensions"; |
3937 | for my $pkg (@EXTS) { |
3935 | for my $pkg (@EXTS) { |
3938 | trace "... unloading $pkg"; |
3936 | trace "... unloading $pkg"; |
3939 | |
3937 | |
3940 | if (my $cb = $pkg->can ("unload")) { |
3938 | if (my $cb = $pkg->can ("unload")) { |
3941 | eval { |
3939 | eval { |
… | |
… | |
3946 | |
3944 | |
3947 | trace "... clearing $pkg"; |
3945 | trace "... clearing $pkg"; |
3948 | clear_package $pkg; |
3946 | clear_package $pkg; |
3949 | } |
3947 | } |
3950 | |
3948 | |
3951 | trace "unloading all perl modules loaded from $LIBDIR"; |
3949 | trace "perl_reload: unloading all perl modules loaded from $LIBDIR"; |
3952 | while (my ($k, $v) = each %INC) { |
3950 | while (my ($k, $v) = each %INC) { |
3953 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3951 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3954 | |
3952 | |
3955 | trace "... unloading $k"; |
3953 | trace "... unloading $k"; |
3956 | delete $INC{$k}; |
3954 | delete $INC{$k}; |
… | |
… | |
3963 | } |
3961 | } |
3964 | |
3962 | |
3965 | clear_package $k; |
3963 | clear_package $k; |
3966 | } |
3964 | } |
3967 | |
3965 | |
3968 | trace "getting rid of safe::, as good as possible"; |
3966 | trace "perl_reload: getting rid of safe::, as good as possible"; |
3969 | clear_package "safe::$_" |
3967 | clear_package "safe::$_" |
3970 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3968 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3971 | |
3969 | |
3972 | trace "unloading cf.pm \"a bit\""; |
3970 | trace "perl_reload: unloading cf.pm \"a bit\""; |
3973 | delete $INC{"cf.pm"}; |
3971 | delete $INC{"cf.pm"}; |
3974 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3972 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3975 | |
3973 | |
3976 | # don't, removes xs symbols, too, |
3974 | # don't, removes xs symbols, too, |
3977 | # and global variables created in xs |
3975 | # and global variables created in xs |
3978 | #clear_package __PACKAGE__; |
3976 | #clear_package __PACKAGE__; |
3979 | |
3977 | |
3980 | info "unload completed, starting to reload now"; |
3978 | info "perl_reload: unload completed, starting to reload now"; |
3981 | |
3979 | |
3982 | trace "reloading cf.pm"; |
3980 | trace "perl_reload: reloading cf.pm"; |
3983 | require cf; |
3981 | require cf; |
3984 | cf::_connect_to_perl_1; |
3982 | cf::_connect_to_perl_1; |
3985 | |
3983 | |
3986 | trace "loading config and database again"; |
3984 | trace "perl_reload: loading config and database again"; |
3987 | cf::reload_config; |
3985 | cf::reload_config; |
3988 | |
3986 | |
3989 | trace "loading extensions"; |
3987 | trace "perl_reload: loading extensions"; |
3990 | cf::load_extensions; |
3988 | cf::load_extensions; |
3991 | |
3989 | |
3992 | if ($REATTACH_ON_RELOAD) { |
3990 | if ($REATTACH_ON_RELOAD) { |
3993 | trace "reattaching attachments to objects/players"; |
3991 | trace "perl_reload: reattaching attachments to objects/players"; |
3994 | _global_reattach; # objects, sockets |
3992 | _global_reattach; # objects, sockets |
3995 | trace "reattaching attachments to maps"; |
3993 | trace "perl_reload: reattaching attachments to maps"; |
3996 | reattach $_ for values %MAP; |
3994 | reattach $_ for values %MAP; |
3997 | trace "reattaching attachments to players"; |
3995 | trace "perl_reload: reattaching attachments to players"; |
3998 | reattach $_ for values %PLAYER; |
3996 | reattach $_ for values %PLAYER; |
3999 | } |
3997 | } |
4000 | |
3998 | |
4001 | trace "running post_init jobs"; |
3999 | cf::_post_init 1; |
4002 | (pop @POST_INIT)->(1) while @POST_INIT; |
|
|
4003 | |
4000 | |
4004 | trace "leaving sync_job"; |
4001 | trace "perl_reload: leaving sync_job"; |
4005 | |
4002 | |
4006 | 1 |
4003 | 1 |
4007 | } or do { |
4004 | } or do { |
4008 | error $@; |
4005 | error $@; |
4009 | cf::cleanup "error while reloading, exiting."; |
4006 | cf::cleanup "perl_reload: error, exiting."; |
4010 | }; |
4007 | }; |
4011 | |
4008 | |
4012 | info "reloaded"; |
|
|
4013 | --$RELOAD; |
4009 | --$RELOAD; |
4014 | } |
4010 | } |
4015 | |
4011 | |
4016 | $t1 = AE::time - $t1; |
4012 | $t1 = AE::time - $t1; |
4017 | info "reload completed in ${t1}s\n"; |
4013 | info "perl_reload: completed in ${t1}s\n"; |
4018 | }; |
4014 | }; |
4019 | |
4015 | |
4020 | our $RELOAD_WATCHER; # used only during reload |
4016 | our $RELOAD_WATCHER; # used only during reload |
4021 | |
4017 | |
4022 | sub reload_perl() { |
4018 | sub reload_perl() { |
… | |
… | |
4050 | my $bug_warning = 0; |
4046 | my $bug_warning = 0; |
4051 | |
4047 | |
4052 | our @WAIT_FOR_TICK; |
4048 | our @WAIT_FOR_TICK; |
4053 | our @WAIT_FOR_TICK_BEGIN; |
4049 | our @WAIT_FOR_TICK_BEGIN; |
4054 | |
4050 | |
4055 | sub wait_for_tick { |
4051 | sub wait_for_tick() { |
4056 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4052 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4057 | |
4053 | |
4058 | my $signal = new Coro::Signal; |
4054 | my $signal = new Coro::Signal; |
4059 | push @WAIT_FOR_TICK, $signal; |
4055 | push @WAIT_FOR_TICK, $signal; |
4060 | $signal->wait; |
4056 | $signal->wait; |
4061 | } |
4057 | } |
4062 | |
4058 | |
4063 | sub wait_for_tick_begin { |
4059 | sub wait_for_tick_begin() { |
4064 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4060 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4065 | |
4061 | |
4066 | my $signal = new Coro::Signal; |
4062 | my $signal = new Coro::Signal; |
4067 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4063 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4068 | $signal->wait; |
4064 | $signal->wait; |
… | |
… | |
4155 | IO::AIO::min_parallel 8; |
4151 | IO::AIO::min_parallel 8; |
4156 | IO::AIO::max_poll_time $TICK * 0.1; |
4152 | IO::AIO::max_poll_time $TICK * 0.1; |
4157 | undef $AnyEvent::AIO::WATCHER; |
4153 | undef $AnyEvent::AIO::WATCHER; |
4158 | } |
4154 | } |
4159 | |
4155 | |
4160 | my $_log_backtrace; |
4156 | our $_log_backtrace; |
|
|
4157 | our $_log_backtrace_last; |
4161 | |
4158 | |
4162 | sub _log_backtrace { |
4159 | sub _log_backtrace { |
4163 | my ($msg, @addr) = @_; |
4160 | my ($msg, @addr) = @_; |
4164 | |
4161 | |
4165 | $msg =~ s/\n//; |
4162 | $msg =~ s/\n$//; |
4166 | |
4163 | |
|
|
4164 | if ($_log_backtrace_last eq $msg) { |
|
|
4165 | LOG llevInfo, "[ABT] $msg\n"; |
|
|
4166 | LOG llevInfo, "[ABT] [duplicate, suppressed]\n"; |
4167 | # limit the # of concurrent backtraces |
4167 | # limit the # of concurrent backtraces |
4168 | if ($_log_backtrace < 2) { |
4168 | } elsif ($_log_backtrace < 2) { |
|
|
4169 | $_log_backtrace_last = $msg; |
4169 | ++$_log_backtrace; |
4170 | ++$_log_backtrace; |
4170 | my $perl_bt = Carp::longmess $msg; |
4171 | my $perl_bt = Carp::longmess $msg; |
4171 | async { |
4172 | async { |
4172 | $Coro::current->{desc} = "abt $msg"; |
4173 | $Coro::current->{desc} = "abt $msg"; |
4173 | |
4174 | |
… | |
… | |
4193 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4194 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4194 | --$_log_backtrace; |
4195 | --$_log_backtrace; |
4195 | }; |
4196 | }; |
4196 | } else { |
4197 | } else { |
4197 | LOG llevInfo, "[ABT] $msg\n"; |
4198 | LOG llevInfo, "[ABT] $msg\n"; |
4198 | LOG llevInfo, "[ABT] [suppressed]\n"; |
4199 | LOG llevInfo, "[ABT] [overload, suppressed]\n"; |
4199 | } |
4200 | } |
4200 | } |
4201 | } |
4201 | |
4202 | |
4202 | # load additional modules |
4203 | # load additional modules |
4203 | require "cf/$_.pm" for @EXTRA_MODULES; |
4204 | require "cf/$_.pm" for @EXTRA_MODULES; |