ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

… …
124our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 127our $DB_ENV;
128 128
129our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 130
131our %CFG; 131our %CFG;
132 132
133our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 134our $RUNTIME;
… …
233from wherever your confdir points to. 233from 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
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
240 245
241=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
242 247
243This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 358
354sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
356 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub 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
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
361 378
362The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 380is a reload or not.
364 381
365=cut 382=cut
366 383
367sub post_init(&) { 384sub post_init(&) {
368 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _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
373Wait until the given lock is available. See cf::lock_acquire. 407Wait 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
585Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 622never block itself or use any form of event handling.
589 623
590=cut 624=cut
591 625
626sub post_fork {
627 reset_signals;
628}
629
592sub fork_call(&@) { 630sub 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
607sub objinfo { 645sub 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;
… …
1821sub generate_random_map { 1861sub generate_random_map {
1822 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1823 1863
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825 1865
1826 # mit "rum" bekleckern, nicht
1827 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1831 $rmp->{exit_on_final_map},
1832 $rmp->{xsize}, $rmp->{ysize},
1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1835 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1836 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1837 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1838 (cf::region::find $rmp->{region}), $rmp->{custom}
1839 )
1840} 1867}
1841 1868
1842=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1843 1870
1844Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
… …
1870} 1897}
1871 1898
1872sub normalise { 1899sub normalise {
1873 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1874 1901
1875 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1876 1903
1877 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1878 1905
1879 # map plan: 1906 # map plan:
1880 # 1907 #
… …
1895 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1896 $path = "$base/$path"; 1923 $path = "$base/$path";
1897 } 1924 }
1898 1925
1899 for ($path) { 1926 for ($path) {
1900 redo if s{//}{/};
1901 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1902 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1903 } 1929 }
1904 1930
1905 $path 1931 $path
… …
1919 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1920 return $self; 1946 return $self;
1921 } 1947 }
1922 } 1948 }
1923 1949
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 1951 ()
1926} 1952}
1927 1953
1928sub init { 1954sub init {
1929 my ($self) = @_; 1955 my ($self) = @_;
… …
2051} 2077}
2052 2078
2053sub find; 2079sub find;
2054sub find { 2080sub find {
2055 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
2056 2084
2057 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
2058 2086
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2145 2173
2146 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2147 } 2175 }
2148 2176
2149 $self->post_load; 2177 $self->post_load;
2178
2179 1
2150} 2180}
2151 2181
2152# customize the map for a given player, i.e. 2182# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player 2183# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath 2184# maps to change the path to ~playername/mappath
… …
3358=cut 3388=cut
3359 3389
3360############################################################################# 3390#############################################################################
3361# the server's init and main functions 3391# the server's init and main functions
3362 3392
3363# async inc loader. yay.
3364sub 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
3390sub 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
3406sub load_facedata($) { 3393sub load_facedata($) {
3407 my ($path) = @_; 3394 my ($path) = @_;
3408 3395
3409 # HACK to clear player env face cache, we need some signal framework 3396 # HACK to clear player env face cache, we need some signal framework
3410 # for this (global event?) 3397 # for this (global event?)
… …
3412 3399
3413 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3414 3401
3415 trace "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3416 3403
3417 my $facedata;
3418 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3419 or die "$path: $!"; 3405 or die "$path: $!";
3420 3406
3421 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3422 3408
3423 $facedata->{version} == 2 3409 $facedata->{version} == 2
… …
3440 3426
3441 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3442 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3445 3432
3446 cf::cede_to_tick; 3433 cf::cede_to_tick;
3447 } 3434 }
3448 3435
3449 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
… …
3567} 3554}
3568 3555
3569sub reload_resources { 3556sub reload_resources {
3570 trace "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3571 3558
3559 reload_exp_table;
3560 reload_materials;
3572 reload_facedata; 3561 reload_facedata;
3573 reload_sound; 3562 reload_sound;
3574 reload_archetypes; 3563 reload_archetypes;
3575 reload_regions; 3564 reload_regions;
3576 reload_treasures; 3565 reload_treasures;
… …
3579} 3568}
3580 3569
3581sub reload_config { 3570sub reload_config {
3582 trace "reloading config file...\n"; 3571 trace "reloading config file...\n";
3583 3572
3584 open my $fh, "<:utf8", "$CONFDIR/config" 3573 0 < aio_load "$CONFDIR/config", my $config
3585 or return; 3574 or die "$CONFDIR/config: $!";
3586 3575
3587 local $/; 3576 utf8::decode $config;
3588 *CFG = YAML::XS::Load scalar <$fh>; 3577 *CFG = yaml_load $config;
3589 3578
3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3591 3580
3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $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}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3586 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3598 and die "WARNING: m(un)lockall failed: $!\n"; 3587 and die "WARNING: m(un)lockall failed: $!\n";
3599 }; 3588 };
3600 warn $@ if $@; 3589 warn $@ if $@;
3601 } 3590 }
3602
3603 trace "finished reloading resource files\n";
3604} 3591}
3605 3592
3606sub pidfile() { 3593sub pidfile() {
3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608 or die "$PIDFILE: $!"; 3595 or die "$PIDFILE: $!";
… …
3651 }; 3638 };
3652 3639
3653 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3654 3641
3655 cf::sync_job { 3642 cf::sync_job {
3656 init_inc; 3643 cf::incloader::init ();
3657 3644
3658 cf::init_experience;
3659 cf::init_anim; 3645 cf::init_anim;
3660 cf::init_attackmess; 3646 cf::init_attackmess;
3661 cf::init_dynamic; 3647 cf::init_dynamic;
3662 3648
3663 cf::load_settings; 3649 cf::load_settings;
3664 cf::load_materials;
3665 3650
3666 reload_resources; 3651 reload_resources;
3667 reload_config; 3652 reload_config;
3668 db_init; 3653 db_init;
3669 3654
… …
3681 3666
3682 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX (); 3668 use POSIX ();
3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3685 3670
3686 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3687 }; 3672 };
3688 3673
3689 cf::object::thawer::errors_are_fatal 0; 3674 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n"; 3675 info "parse errors in files are no longer fatal from this point on.\n";
3691 3676
… …
3903 } 3888 }
3904} 3889}
3905 3890
3906sub do_reload_perl() { 3891sub do_reload_perl() {
3907 # can/must only be called in main 3892 # can/must only be called in main
3908 if (in_main) { 3893 unless (in_main) {
3909 error "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3910 return; 3895 return;
3911 } 3896 }
3912 3897
3913 return if $RELOAD++; 3898 return if $RELOAD++;
3914 3899
3915 my $t1 = AE::time; 3900 my $t1 = AE::time;
3916 3901
3917 while ($RELOAD) { 3902 while ($RELOAD) {
3903 cf::get_slot 0.1, -1, "reload_perl";
3918 info "reloading..."; 3904 info "perl_reload: reloading...";
3919 3905
3920 trace "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3921 3907
3922 cf::sync_job { 3908 cf::sync_job {
3923 cf::emergency_save; 3909 #cf::emergency_save;
3924 3910
3925 trace "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3926 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3927 %EXT_CORO = (); 3913 %EXT_CORO = ();
3928 3914
3929 trace "removing commands"; 3915 trace "perl_reload: removing commands";
3930 %COMMAND = (); 3916 %COMMAND = ();
3931 3917
3932 trace "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3933 %EXTCMD = (); 3919 %EXTCMD = ();
3934 %EXTICMD = (); 3920 %EXTICMD = ();
3935 3921
3936 trace "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3937 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3938 trace "... unloading $pkg"; 3924 trace "... unloading $pkg";
3939 3925
3940 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3941 eval { 3927 eval {
… …
3946 3932
3947 trace "... clearing $pkg"; 3933 trace "... clearing $pkg";
3948 clear_package $pkg; 3934 clear_package $pkg;
3949 } 3935 }
3950 3936
3951 trace "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3952 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3954 3940
3955 trace "... unloading $k"; 3941 trace "... unloading $k";
3956 delete $INC{$k}; 3942 delete $INC{$k};
… …
3963 } 3949 }
3964 3950
3965 clear_package $k; 3951 clear_package $k;
3966 } 3952 }
3967 3953
3968 trace "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3969 clear_package "safe::$_" 3955 clear_package "safe::$_"
3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3971 3957
3972 trace "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3973 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3975 3961
3976 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3977 # and global variables created in xs 3963 # and global variables created in xs
3978 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3979 3965
3980 info "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3981 3967
3982 trace "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3983 require cf; 3969 require cf;
3984 cf::_connect_to_perl_1; 3970 cf::_connect_to_perl_1;
3985 3971
3986 trace "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3987 cf::reload_config; 3973 cf::reload_config;
3988 3974
3989 trace "loading extensions"; 3975 trace "perl_reload: loading extensions";
3990 cf::load_extensions; 3976 cf::load_extensions;
3991 3977
3992 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3993 trace "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3994 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3995 trace "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3996 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3997 trace "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3998 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3999 } 3985 }
4000 3986
4001 trace "running post_init jobs"; 3987 cf::_post_init 1;
4002 (pop @POST_INIT)->(1) while @POST_INIT;
4003 3988
4004 trace "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
4005 3990
4006 1 3991 1
4007 } or do { 3992 } or do {
4008 error $@; 3993 error $@;
4009 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
4010 }; 3995 };
4011 3996
4012 info "reloaded";
4013 --$RELOAD; 3997 --$RELOAD;
4014 } 3998 }
4015 3999
4016 $t1 = AE::time - $t1; 4000 $t1 = AE::time - $t1;
4017 info "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
4018}; 4002};
4019 4003
4020our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
4021 4005
4022sub reload_perl() { 4006sub reload_perl() {
… …
4050my $bug_warning = 0; 4034my $bug_warning = 0;
4051 4035
4052our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
4053our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
4054 4038
4055sub wait_for_tick { 4039sub wait_for_tick() {
4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4057 4041
4058 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
4059 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
4060 $signal->wait; 4044 $signal->wait;
4061} 4045}
4062 4046
4063sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4065 4049
4066 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
4067 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
4068 $signal->wait; 4052 $signal->wait;
… …
4155 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
4156 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
4157 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
4158} 4142}
4159 4143
4160my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
4161 4146
4162sub _log_backtrace { 4147sub _log_backtrace {
4163 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
4164 4149
4165 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
4166 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4167 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
4168 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
4169 ++$_log_backtrace; 4158 ++$_log_backtrace;
4170 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
4171 async { 4160 async {
4172 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
4173 4162
… …
4193 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
4194 --$_log_backtrace; 4183 --$_log_backtrace;
4195 }; 4184 };
4196 } else { 4185 } else {
4197 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
4198 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4199 } 4188 }
4200} 4189}
4201 4190
4202# load additional modules 4191# load additional modules
4203require "cf/$_.pm" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines