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.541 by root, Tue May 4 23:33:16 2010 UTC vs.
Revision 1.554 by root, Sat Jun 26 22:10:18 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;
… …
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 1866 # mit "rum" bekleckern, nicht
1827 $self->_create_random_map ( 1867 $self->_create_random_map (
1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp,
1869 $rmp->{wall_name}, $rmp->{monsterstyle},
1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle}, 1870 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1871 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{this_map},
1831 $rmp->{exit_on_final_map}, 1872 $rmp->{exit_on_final_map},
1832 $rmp->{xsize}, $rmp->{ysize}, 1873 $rmp->{xsize}, $rmp->{ysize},
1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1874 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1875 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1835 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1876 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1836 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1877 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1837 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1878 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1838 (cf::region::find $rmp->{region}), $rmp->{custom} 1879 (cf::region::find $rmp->{region})
1839 ) 1880 )
1840} 1881}
1841 1882
1842=item cf::map->register ($regex, $prio) 1883=item cf::map->register ($regex, $prio)
1843 1884
… …
1870} 1911}
1871 1912
1872sub normalise { 1913sub normalise {
1873 my ($path, $base) = @_; 1914 my ($path, $base) = @_;
1874 1915
1875 $path = "$path"; # make sure its a string 1916 $path = "$path"; # make sure it's a string
1876 1917
1877 $path =~ s/\.map$//; 1918 $path =~ s/\.map$//;
1878 1919
1879 # map plan: 1920 # map plan:
1880 # 1921 #
… …
1895 $base =~ s{[^/]+/?$}{}; 1936 $base =~ s{[^/]+/?$}{};
1896 $path = "$base/$path"; 1937 $path = "$base/$path";
1897 } 1938 }
1898 1939
1899 for ($path) { 1940 for ($path) {
1900 redo if s{//}{/};
1901 redo if s{/\.?/}{/}; 1941 redo if s{/\.?/}{/};
1902 redo if s{/[^/]+/\.\./}{/}; 1942 redo if s{/[^/]+/\.\./}{/};
1903 } 1943 }
1904 1944
1905 $path 1945 $path
… …
1919 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1920 return $self; 1960 return $self;
1921 } 1961 }
1922 } 1962 }
1923 1963
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 1965 ()
1926} 1966}
1927 1967
1928sub init { 1968sub init {
1929 my ($self) = @_; 1969 my ($self) = @_;
… …
2051} 2091}
2052 2092
2053sub find; 2093sub find;
2054sub find { 2094sub find {
2055 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2096
2097 cf::cede_to_tick;
2056 2098
2057 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
2058 2100
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2145 2187
2146 $self->in_memory (cf::MAP_ACTIVE); 2188 $self->in_memory (cf::MAP_ACTIVE);
2147 } 2189 }
2148 2190
2149 $self->post_load; 2191 $self->post_load;
2192
2193 1
2150} 2194}
2151 2195
2152# customize the map for a given player, i.e. 2196# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player 2197# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath 2198# maps to change the path to ~playername/mappath
… …
3358=cut 3402=cut
3359 3403
3360############################################################################# 3404#############################################################################
3361# the server's init and main functions 3405# the server's init and main functions
3362 3406
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 ref $dir and next;
3376 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377 or next;
3378
3379 $data = "#line 1 $dir/$mod\n$data";
3380
3381 open my $fh, "<", \$data or die;
3382
3383 return $fh;
3384 }
3385
3386 ()
3387}
3388
3389sub init_inc {
3390 # save original @INC
3391 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393 # make sure we can do scalar-opens
3394 open my $dummy, "<", \my $dummy2;
3395
3396 # execute some stuff so perl load's some of the core modules
3397 /Ü/ =~ /ü/i;
3398 eval { &Storable::nstore_fd };
3399
3400 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402 debug "module loading will be asynchronous from this point on.";
3403}
3404
3405sub load_facedata($) { 3407sub load_facedata($) {
3406 my ($path) = @_; 3408 my ($path) = @_;
3407 3409
3408 # HACK to clear player env face cache, we need some signal framework 3410 # HACK to clear player env face cache, we need some signal framework
3409 # for this (global event?) 3411 # for this (global event?)
… …
3411 3413
3412 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3414 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3413 3415
3414 trace "loading facedata from $path\n"; 3416 trace "loading facedata from $path\n";
3415 3417
3416 my $facedata;
3417 0 < aio_load $path, $facedata 3418 0 < aio_load $path, my $facedata
3418 or die "$path: $!"; 3419 or die "$path: $!";
3419 3420
3420 $facedata = Coro::Storable::thaw $facedata; 3421 $facedata = Coro::Storable::thaw $facedata;
3421 3422
3422 $facedata->{version} == 2 3423 $facedata->{version} == 2
… …
3566} 3567}
3567 3568
3568sub reload_resources { 3569sub reload_resources {
3569 trace "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3570 3571
3572 reload_exp_table;
3573 reload_materials;
3571 reload_facedata; 3574 reload_facedata;
3572 reload_sound; 3575 reload_sound;
3573 reload_archetypes; 3576 reload_archetypes;
3574 reload_regions; 3577 reload_regions;
3575 reload_treasures; 3578 reload_treasures;
… …
3578} 3581}
3579 3582
3580sub reload_config { 3583sub reload_config {
3581 trace "reloading config file...\n"; 3584 trace "reloading config file...\n";
3582 3585
3583 open my $fh, "<:utf8", "$CONFDIR/config" 3586 0 < aio_load "$CONFDIR/config", my $config
3584 or return; 3587 or die "$CONFDIR/config: $!";
3585 3588
3586 local $/; 3589 utf8::decode $config;
3587 *CFG = YAML::XS::Load scalar <$fh>; 3590 *CFG = yaml_load $config;
3588 3591
3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3592 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3590 3593
3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3594 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3595 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3596 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3599 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3597 and die "WARNING: m(un)lockall failed: $!\n"; 3600 and die "WARNING: m(un)lockall failed: $!\n";
3598 }; 3601 };
3599 warn $@ if $@; 3602 warn $@ if $@;
3600 } 3603 }
3601
3602 trace "finished reloading resource files\n";
3603} 3604}
3604 3605
3605sub pidfile() { 3606sub pidfile() {
3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3607 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
… …
3650 }; 3651 };
3651 3652
3652 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3653 3654
3654 cf::sync_job { 3655 cf::sync_job {
3655 init_inc; 3656 cf::incloader::init ();
3656 3657
3657 cf::init_experience;
3658 cf::init_anim; 3658 cf::init_anim;
3659 cf::init_attackmess; 3659 cf::init_attackmess;
3660 cf::init_dynamic; 3660 cf::init_dynamic;
3661 3661
3662 cf::load_settings; 3662 cf::load_settings;
3663 cf::load_materials;
3664 3663
3665 reload_resources; 3664 reload_resources;
3666 reload_config; 3665 reload_config;
3667 db_init; 3666 db_init;
3668 3667
… …
3680 3679
3681 # no (long-running) fork's whatsoever before this point(!) 3680 # no (long-running) fork's whatsoever before this point(!)
3682 use POSIX (); 3681 use POSIX ();
3683 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3684 3683
3685 (pop @POST_INIT)->(0) while @POST_INIT; 3684 cf::_post_init 0;
3686 }; 3685 };
3687 3686
3688 cf::object::thawer::errors_are_fatal 0; 3687 cf::object::thawer::errors_are_fatal 0;
3689 info "parse errors in files are no longer fatal from this point on.\n"; 3688 info "parse errors in files are no longer fatal from this point on.\n";
3690 3689
… …
3902 } 3901 }
3903} 3902}
3904 3903
3905sub do_reload_perl() { 3904sub do_reload_perl() {
3906 # can/must only be called in main 3905 # can/must only be called in main
3907 if (in_main) { 3906 unless (in_main) {
3908 error "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3909 return; 3908 return;
3910 } 3909 }
3911 3910
3912 return if $RELOAD++; 3911 return if $RELOAD++;
3913 3912
3914 my $t1 = AE::time; 3913 my $t1 = AE::time;
3915 3914
3916 while ($RELOAD) { 3915 while ($RELOAD) {
3916 cf::get_slot 0.1, -1, "reload_perl";
3917 info "reloading..."; 3917 info "perl_reload: reloading...";
3918 3918
3919 trace "entering sync_job"; 3919 trace "perl_reload: entering sync_job";
3920 3920
3921 cf::sync_job { 3921 cf::sync_job {
3922 cf::emergency_save; 3922 #cf::emergency_save;
3923 3923
3924 trace "cancelling all extension coros"; 3924 trace "perl_reload: cancelling all extension coros";
3925 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3926 %EXT_CORO = (); 3926 %EXT_CORO = ();
3927 3927
3928 trace "removing commands"; 3928 trace "perl_reload: removing commands";
3929 %COMMAND = (); 3929 %COMMAND = ();
3930 3930
3931 trace "removing ext/exti commands"; 3931 trace "perl_reload: removing ext/exti commands";
3932 %EXTCMD = (); 3932 %EXTCMD = ();
3933 %EXTICMD = (); 3933 %EXTICMD = ();
3934 3934
3935 trace "unloading/nuking all extensions"; 3935 trace "perl_reload: unloading/nuking all extensions";
3936 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3937 trace "... unloading $pkg"; 3937 trace "... unloading $pkg";
3938 3938
3939 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3940 eval { 3940 eval {
… …
3945 3945
3946 trace "... clearing $pkg"; 3946 trace "... clearing $pkg";
3947 clear_package $pkg; 3947 clear_package $pkg;
3948 } 3948 }
3949 3949
3950 trace "unloading all perl modules loaded from $LIBDIR"; 3950 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3951 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3953 3953
3954 trace "... unloading $k"; 3954 trace "... unloading $k";
3955 delete $INC{$k}; 3955 delete $INC{$k};
… …
3962 } 3962 }
3963 3963
3964 clear_package $k; 3964 clear_package $k;
3965 } 3965 }
3966 3966
3967 trace "getting rid of safe::, as good as possible"; 3967 trace "perl_reload: getting rid of safe::, as good as possible";
3968 clear_package "safe::$_" 3968 clear_package "safe::$_"
3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3970 3970
3971 trace "unloading cf.pm \"a bit\""; 3971 trace "perl_reload: unloading cf.pm \"a bit\"";
3972 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3974 3974
3975 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3976 # and global variables created in xs 3976 # and global variables created in xs
3977 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3978 3978
3979 info "unload completed, starting to reload now"; 3979 info "perl_reload: unload completed, starting to reload now";
3980 3980
3981 trace "reloading cf.pm"; 3981 trace "perl_reload: reloading cf.pm";
3982 require cf; 3982 require cf;
3983 cf::_connect_to_perl_1; 3983 cf::_connect_to_perl_1;
3984 3984
3985 trace "loading config and database again"; 3985 trace "perl_reload: loading config and database again";
3986 cf::reload_config; 3986 cf::reload_config;
3987 3987
3988 trace "loading extensions"; 3988 trace "perl_reload: loading extensions";
3989 cf::load_extensions; 3989 cf::load_extensions;
3990 3990
3991 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3992 trace "reattaching attachments to objects/players"; 3992 trace "perl_reload: reattaching attachments to objects/players";
3993 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3994 trace "reattaching attachments to maps"; 3994 trace "perl_reload: reattaching attachments to maps";
3995 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3996 trace "reattaching attachments to players"; 3996 trace "perl_reload: reattaching attachments to players";
3997 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3998 } 3998 }
3999 3999
4000 trace "running post_init jobs"; 4000 cf::_post_init 1;
4001 (pop @POST_INIT)->(1) while @POST_INIT;
4002 4001
4003 trace "leaving sync_job"; 4002 trace "perl_reload: leaving sync_job";
4004 4003
4005 1 4004 1
4006 } or do { 4005 } or do {
4007 error $@; 4006 error $@;
4008 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "perl_reload: error, exiting.";
4009 }; 4008 };
4010 4009
4011 info "reloaded";
4012 --$RELOAD; 4010 --$RELOAD;
4013 } 4011 }
4014 4012
4015 $t1 = AE::time - $t1; 4013 $t1 = AE::time - $t1;
4016 info "reload completed in ${t1}s\n"; 4014 info "perl_reload: completed in ${t1}s\n";
4017}; 4015};
4018 4016
4019our $RELOAD_WATCHER; # used only during reload 4017our $RELOAD_WATCHER; # used only during reload
4020 4018
4021sub reload_perl() { 4019sub reload_perl() {
… …
4049my $bug_warning = 0; 4047my $bug_warning = 0;
4050 4048
4051our @WAIT_FOR_TICK; 4049our @WAIT_FOR_TICK;
4052our @WAIT_FOR_TICK_BEGIN; 4050our @WAIT_FOR_TICK_BEGIN;
4053 4051
4054sub wait_for_tick { 4052sub wait_for_tick() {
4055 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4053 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4056 4054
4057 my $signal = new Coro::Signal; 4055 my $signal = new Coro::Signal;
4058 push @WAIT_FOR_TICK, $signal; 4056 push @WAIT_FOR_TICK, $signal;
4059 $signal->wait; 4057 $signal->wait;
4060} 4058}
4061 4059
4062sub wait_for_tick_begin { 4060sub wait_for_tick_begin() {
4063 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4061 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4064 4062
4065 my $signal = new Coro::Signal; 4063 my $signal = new Coro::Signal;
4066 push @WAIT_FOR_TICK_BEGIN, $signal; 4064 push @WAIT_FOR_TICK_BEGIN, $signal;
4067 $signal->wait; 4065 $signal->wait;
… …
4154 IO::AIO::min_parallel 8; 4152 IO::AIO::min_parallel 8;
4155 IO::AIO::max_poll_time $TICK * 0.1; 4153 IO::AIO::max_poll_time $TICK * 0.1;
4156 undef $AnyEvent::AIO::WATCHER; 4154 undef $AnyEvent::AIO::WATCHER;
4157} 4155}
4158 4156
4159my $_log_backtrace; 4157our $_log_backtrace;
4158our $_log_backtrace_last;
4160 4159
4161sub _log_backtrace { 4160sub _log_backtrace {
4162 my ($msg, @addr) = @_; 4161 my ($msg, @addr) = @_;
4163 4162
4164 $msg =~ s/\n//; 4163 $msg =~ s/\n$//;
4165 4164
4165 if ($_log_backtrace_last eq $msg) {
4166 LOG llevInfo, "[ABT] $msg\n";
4167 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4166 # limit the # of concurrent backtraces 4168 # limit the # of concurrent backtraces
4167 if ($_log_backtrace < 2) { 4169 } elsif ($_log_backtrace < 2) {
4170 $_log_backtrace_last = $msg;
4168 ++$_log_backtrace; 4171 ++$_log_backtrace;
4169 my $perl_bt = Carp::longmess $msg; 4172 my $perl_bt = Carp::longmess $msg;
4170 async { 4173 async {
4171 $Coro::current->{desc} = "abt $msg"; 4174 $Coro::current->{desc} = "abt $msg";
4172 4175
… …
4192 LOG llevInfo, "[ABT] $_\n" for @bt; 4195 LOG llevInfo, "[ABT] $_\n" for @bt;
4193 --$_log_backtrace; 4196 --$_log_backtrace;
4194 }; 4197 };
4195 } else { 4198 } else {
4196 LOG llevInfo, "[ABT] $msg\n"; 4199 LOG llevInfo, "[ABT] $msg\n";
4197 LOG llevInfo, "[ABT] [suppressed]\n"; 4200 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4198 } 4201 }
4199} 4202}
4200 4203
4201# load additional modules 4204# load additional modules
4202require "cf/$_.pm" for @EXTRA_MODULES; 4205require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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