… | |
… | |
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 { |
… | |
… | |
1641 | my $name = $pl->ob->name; |
1679 | my $name = $pl->ob->name; |
1642 | |
1680 | |
1643 | $pl->{deny_save} = 1; |
1681 | $pl->{deny_save} = 1; |
1644 | $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 |
1645 | |
1683 | |
1646 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1684 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns; |
1647 | $pl->deactivate; |
1685 | $pl->deactivate; |
|
|
1686 | |
1648 | 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; |
1649 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1688 | $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns; |
|
|
1689 | ext::highscore::check ($pl->ob); |
|
|
1690 | |
1650 | $pl->ns->destroy if $pl->ns; |
1691 | $pl->ns->destroy if $pl->ns; |
1651 | |
1692 | |
1652 | my $path = playerdir $pl; |
1693 | my $path = playerdir $pl; |
1653 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1694 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1654 | aio_rename $path, $temp; |
1695 | aio_rename $path, $temp; |
… | |
… | |
3370 | |
3411 | |
3371 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3412 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3372 | |
3413 | |
3373 | trace "loading facedata from $path\n"; |
3414 | trace "loading facedata from $path\n"; |
3374 | |
3415 | |
3375 | my $facedata; |
|
|
3376 | 0 < aio_load $path, $facedata |
3416 | 0 < aio_load $path, my $facedata |
3377 | or die "$path: $!"; |
3417 | or die "$path: $!"; |
3378 | |
3418 | |
3379 | $facedata = Coro::Storable::thaw $facedata; |
3419 | $facedata = Coro::Storable::thaw $facedata; |
3380 | |
3420 | |
3381 | $facedata->{version} == 2 |
3421 | $facedata->{version} == 2 |
… | |
… | |
3499 | sub reload_treasures { |
3539 | sub reload_treasures { |
3500 | load_resource_file "$DATADIR/treasures" |
3540 | load_resource_file "$DATADIR/treasures" |
3501 | or die "unable to load treasurelists\n"; |
3541 | or die "unable to load treasurelists\n"; |
3502 | } |
3542 | } |
3503 | |
3543 | |
3504 | sub reload_exp { |
|
|
3505 | cf::init_experience; |
|
|
3506 | } |
|
|
3507 | |
|
|
3508 | sub reload_sound { |
3544 | sub reload_sound { |
3509 | trace "loading sound config from $DATADIR/sound\n"; |
3545 | trace "loading sound config from $DATADIR/sound\n"; |
3510 | |
3546 | |
3511 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
3547 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
3512 | or die "$DATADIR/sound $!"; |
3548 | or die "$DATADIR/sound $!"; |
… | |
… | |
3529 | } |
3565 | } |
3530 | |
3566 | |
3531 | sub reload_resources { |
3567 | sub reload_resources { |
3532 | trace "reloading resource files...\n"; |
3568 | trace "reloading resource files...\n"; |
3533 | |
3569 | |
3534 | reload_exp; |
3570 | reload_exp_table; |
|
|
3571 | reload_materials; |
3535 | reload_facedata; |
3572 | reload_facedata; |
3536 | reload_sound; |
3573 | reload_sound; |
3537 | reload_archetypes; |
3574 | reload_archetypes; |
3538 | reload_regions; |
3575 | reload_regions; |
3539 | reload_treasures; |
3576 | reload_treasures; |
… | |
… | |
3542 | } |
3579 | } |
3543 | |
3580 | |
3544 | sub reload_config { |
3581 | sub reload_config { |
3545 | trace "reloading config file...\n"; |
3582 | trace "reloading config file...\n"; |
3546 | |
3583 | |
3547 | open my $fh, "<:utf8", "$CONFDIR/config" |
3584 | 0 < aio_load "$CONFDIR/config", my $config |
3548 | or return; |
3585 | or die "$CONFDIR/config: $!"; |
3549 | |
3586 | |
3550 | local $/; |
3587 | utf8::decode $config; |
3551 | *CFG = YAML::XS::Load scalar <$fh>; |
3588 | *CFG = yaml_load $config; |
3552 | |
3589 | |
3553 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3590 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3554 | |
3591 | |
3555 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3592 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3556 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3593 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
… | |
… | |
3560 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3597 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3561 | and die "WARNING: m(un)lockall failed: $!\n"; |
3598 | and die "WARNING: m(un)lockall failed: $!\n"; |
3562 | }; |
3599 | }; |
3563 | warn $@ if $@; |
3600 | warn $@ if $@; |
3564 | } |
3601 | } |
3565 | |
|
|
3566 | trace "finished reloading resource files\n"; |
|
|
3567 | } |
3602 | } |
3568 | |
3603 | |
3569 | sub pidfile() { |
3604 | sub pidfile() { |
3570 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3605 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3571 | or die "$PIDFILE: $!"; |
3606 | or die "$PIDFILE: $!"; |
… | |
… | |
3621 | cf::init_anim; |
3656 | cf::init_anim; |
3622 | cf::init_attackmess; |
3657 | cf::init_attackmess; |
3623 | cf::init_dynamic; |
3658 | cf::init_dynamic; |
3624 | |
3659 | |
3625 | cf::load_settings; |
3660 | cf::load_settings; |
3626 | cf::load_materials; |
|
|
3627 | |
3661 | |
3628 | reload_resources; |
3662 | reload_resources; |
3629 | reload_config; |
3663 | reload_config; |
3630 | db_init; |
3664 | db_init; |
3631 | |
3665 | |
… | |
… | |
3643 | |
3677 | |
3644 | # no (long-running) fork's whatsoever before this point(!) |
3678 | # no (long-running) fork's whatsoever before this point(!) |
3645 | use POSIX (); |
3679 | use POSIX (); |
3646 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3680 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3647 | |
3681 | |
3648 | (pop @POST_INIT)->(0) while @POST_INIT; |
3682 | cf::_post_init 0; |
3649 | }; |
3683 | }; |
3650 | |
3684 | |
3651 | cf::object::thawer::errors_are_fatal 0; |
3685 | cf::object::thawer::errors_are_fatal 0; |
3652 | info "parse errors in files are no longer fatal from this point on.\n"; |
3686 | info "parse errors in files are no longer fatal from this point on.\n"; |
3653 | |
3687 | |
… | |
… | |
3876 | |
3910 | |
3877 | my $t1 = AE::time; |
3911 | my $t1 = AE::time; |
3878 | |
3912 | |
3879 | while ($RELOAD) { |
3913 | while ($RELOAD) { |
3880 | cf::get_slot 0.1, -1, "reload_perl"; |
3914 | cf::get_slot 0.1, -1, "reload_perl"; |
3881 | info "reloading..."; |
3915 | info "perl_reload: reloading..."; |
3882 | |
3916 | |
3883 | trace "entering sync_job"; |
3917 | trace "perl_reload: entering sync_job"; |
3884 | |
3918 | |
3885 | cf::sync_job { |
3919 | cf::sync_job { |
3886 | #cf::emergency_save; |
3920 | #cf::emergency_save; |
3887 | |
3921 | |
3888 | trace "cancelling all extension coros"; |
3922 | trace "perl_reload: cancelling all extension coros"; |
3889 | $_->cancel for values %EXT_CORO; |
3923 | $_->cancel for values %EXT_CORO; |
3890 | %EXT_CORO = (); |
3924 | %EXT_CORO = (); |
3891 | |
3925 | |
3892 | trace "removing commands"; |
3926 | trace "perl_reload: removing commands"; |
3893 | %COMMAND = (); |
3927 | %COMMAND = (); |
3894 | |
3928 | |
3895 | trace "removing ext/exti commands"; |
3929 | trace "perl_reload: removing ext/exti commands"; |
3896 | %EXTCMD = (); |
3930 | %EXTCMD = (); |
3897 | %EXTICMD = (); |
3931 | %EXTICMD = (); |
3898 | |
3932 | |
3899 | trace "unloading/nuking all extensions"; |
3933 | trace "perl_reload: unloading/nuking all extensions"; |
3900 | for my $pkg (@EXTS) { |
3934 | for my $pkg (@EXTS) { |
3901 | trace "... unloading $pkg"; |
3935 | trace "... unloading $pkg"; |
3902 | |
3936 | |
3903 | if (my $cb = $pkg->can ("unload")) { |
3937 | if (my $cb = $pkg->can ("unload")) { |
3904 | eval { |
3938 | eval { |
… | |
… | |
3909 | |
3943 | |
3910 | trace "... clearing $pkg"; |
3944 | trace "... clearing $pkg"; |
3911 | clear_package $pkg; |
3945 | clear_package $pkg; |
3912 | } |
3946 | } |
3913 | |
3947 | |
3914 | trace "unloading all perl modules loaded from $LIBDIR"; |
3948 | trace "perl_reload: unloading all perl modules loaded from $LIBDIR"; |
3915 | while (my ($k, $v) = each %INC) { |
3949 | while (my ($k, $v) = each %INC) { |
3916 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3950 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3917 | |
3951 | |
3918 | trace "... unloading $k"; |
3952 | trace "... unloading $k"; |
3919 | delete $INC{$k}; |
3953 | delete $INC{$k}; |
… | |
… | |
3926 | } |
3960 | } |
3927 | |
3961 | |
3928 | clear_package $k; |
3962 | clear_package $k; |
3929 | } |
3963 | } |
3930 | |
3964 | |
3931 | trace "getting rid of safe::, as good as possible"; |
3965 | trace "perl_reload: getting rid of safe::, as good as possible"; |
3932 | clear_package "safe::$_" |
3966 | clear_package "safe::$_" |
3933 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3967 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3934 | |
3968 | |
3935 | trace "unloading cf.pm \"a bit\""; |
3969 | trace "perl_reload: unloading cf.pm \"a bit\""; |
3936 | delete $INC{"cf.pm"}; |
3970 | delete $INC{"cf.pm"}; |
3937 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3971 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3938 | |
3972 | |
3939 | # don't, removes xs symbols, too, |
3973 | # don't, removes xs symbols, too, |
3940 | # and global variables created in xs |
3974 | # and global variables created in xs |
3941 | #clear_package __PACKAGE__; |
3975 | #clear_package __PACKAGE__; |
3942 | |
3976 | |
3943 | info "unload completed, starting to reload now"; |
3977 | info "perl_reload: unload completed, starting to reload now"; |
3944 | |
3978 | |
3945 | trace "reloading cf.pm"; |
3979 | trace "perl_reload: reloading cf.pm"; |
3946 | require cf; |
3980 | require cf; |
3947 | cf::_connect_to_perl_1; |
3981 | cf::_connect_to_perl_1; |
3948 | |
3982 | |
3949 | trace "loading config and database again"; |
3983 | trace "perl_reload: loading config and database again"; |
3950 | cf::reload_config; |
3984 | cf::reload_config; |
3951 | |
3985 | |
3952 | trace "loading extensions"; |
3986 | trace "perl_reload: loading extensions"; |
3953 | cf::load_extensions; |
3987 | cf::load_extensions; |
3954 | |
3988 | |
3955 | if ($REATTACH_ON_RELOAD) { |
3989 | if ($REATTACH_ON_RELOAD) { |
3956 | trace "reattaching attachments to objects/players"; |
3990 | trace "perl_reload: reattaching attachments to objects/players"; |
3957 | _global_reattach; # objects, sockets |
3991 | _global_reattach; # objects, sockets |
3958 | trace "reattaching attachments to maps"; |
3992 | trace "perl_reload: reattaching attachments to maps"; |
3959 | reattach $_ for values %MAP; |
3993 | reattach $_ for values %MAP; |
3960 | trace "reattaching attachments to players"; |
3994 | trace "perl_reload: reattaching attachments to players"; |
3961 | reattach $_ for values %PLAYER; |
3995 | reattach $_ for values %PLAYER; |
3962 | } |
3996 | } |
3963 | |
3997 | |
3964 | trace "running post_init jobs"; |
3998 | cf::_post_init 1; |
3965 | (pop @POST_INIT)->(1) while @POST_INIT; |
|
|
3966 | |
3999 | |
3967 | trace "leaving sync_job"; |
4000 | trace "perl_reload: leaving sync_job"; |
3968 | |
4001 | |
3969 | 1 |
4002 | 1 |
3970 | } or do { |
4003 | } or do { |
3971 | error $@; |
4004 | error $@; |
3972 | cf::cleanup "error while reloading, exiting."; |
4005 | cf::cleanup "perl_reload: error, exiting."; |
3973 | }; |
4006 | }; |
3974 | |
4007 | |
3975 | info "reloaded"; |
|
|
3976 | --$RELOAD; |
4008 | --$RELOAD; |
3977 | } |
4009 | } |
3978 | |
4010 | |
3979 | $t1 = AE::time - $t1; |
4011 | $t1 = AE::time - $t1; |
3980 | info "reload completed in ${t1}s\n"; |
4012 | info "perl_reload: completed in ${t1}s\n"; |
3981 | }; |
4013 | }; |
3982 | |
4014 | |
3983 | our $RELOAD_WATCHER; # used only during reload |
4015 | our $RELOAD_WATCHER; # used only during reload |
3984 | |
4016 | |
3985 | sub reload_perl() { |
4017 | sub reload_perl() { |
… | |
… | |
4013 | my $bug_warning = 0; |
4045 | my $bug_warning = 0; |
4014 | |
4046 | |
4015 | our @WAIT_FOR_TICK; |
4047 | our @WAIT_FOR_TICK; |
4016 | our @WAIT_FOR_TICK_BEGIN; |
4048 | our @WAIT_FOR_TICK_BEGIN; |
4017 | |
4049 | |
4018 | sub wait_for_tick { |
4050 | sub wait_for_tick() { |
4019 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4051 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4020 | |
4052 | |
4021 | my $signal = new Coro::Signal; |
4053 | my $signal = new Coro::Signal; |
4022 | push @WAIT_FOR_TICK, $signal; |
4054 | push @WAIT_FOR_TICK, $signal; |
4023 | $signal->wait; |
4055 | $signal->wait; |
4024 | } |
4056 | } |
4025 | |
4057 | |
4026 | sub wait_for_tick_begin { |
4058 | sub wait_for_tick_begin() { |
4027 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4059 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4028 | |
4060 | |
4029 | my $signal = new Coro::Signal; |
4061 | my $signal = new Coro::Signal; |
4030 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4062 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4031 | $signal->wait; |
4063 | $signal->wait; |