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.537 by root, Sun May 2 19:16:16 2010 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
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 {
… …
1423 1461
1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1426 1464
1427 $ext{source} = 1465 $ext{source} =
1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1429 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1430 . $source 1468 . $source
1431 . "\n};\n1"; 1469 . "\n};\n1";
1432 1470
1433 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
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;
… …
1820sub generate_random_map { 1861sub generate_random_map {
1821 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1822 1863
1823 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
1824 1865
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1867}
1840 1868
1841=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1842 1870
1843Register 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
… …
1848 1876
1849sub register { 1877sub register {
1850 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1851 my $pkg = caller; 1879 my $pkg = caller;
1852 1880
1853 no strict;
1854 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1855 1882
1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1857} 1884}
1858 1885
… …
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
… …
3273 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3274 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3275 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3276 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3277) { 3307) {
3278 no strict 'refs';
3279 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3281 for @funs; 3310 for @funs;
3282} 3311}
3283 3312
… …
3370 3399
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3401
3373 trace "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3374 3403
3375 my $facedata;
3376 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3377 or die "$path: $!"; 3405 or die "$path: $!";
3378 3406
3379 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3380 3408
3381 $facedata->{version} == 2 3409 $facedata->{version} == 2
… …
3398 3426
3399 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 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} ;
3403 3432
3404 cf::cede_to_tick; 3433 cf::cede_to_tick;
3405 } 3434 }
3406 3435
3407 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
… …
3525} 3554}
3526 3555
3527sub reload_resources { 3556sub reload_resources {
3528 trace "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3529 3558
3559 reload_exp_table;
3560 reload_materials;
3530 reload_facedata; 3561 reload_facedata;
3531 reload_sound; 3562 reload_sound;
3532 reload_archetypes; 3563 reload_archetypes;
3533 reload_regions; 3564 reload_regions;
3534 reload_treasures; 3565 reload_treasures;
… …
3537} 3568}
3538 3569
3539sub reload_config { 3570sub reload_config {
3540 trace "reloading config file...\n"; 3571 trace "reloading config file...\n";
3541 3572
3542 open my $fh, "<:utf8", "$CONFDIR/config" 3573 0 < aio_load "$CONFDIR/config", my $config
3543 or return; 3574 or die "$CONFDIR/config: $!";
3544 3575
3545 local $/; 3576 utf8::decode $config;
3546 *CFG = YAML::XS::Load scalar <$fh>; 3577 *CFG = yaml_load $config;
3547 3578
3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549 3580
3550 $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};
3551 $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};
… …
3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3586 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556 and die "WARNING: m(un)lockall failed: $!\n"; 3587 and die "WARNING: m(un)lockall failed: $!\n";
3557 }; 3588 };
3558 warn $@ if $@; 3589 warn $@ if $@;
3559 } 3590 }
3560
3561 trace "finished reloading resource files\n";
3562} 3591}
3563 3592
3564sub pidfile() { 3593sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!"; 3595 or die "$PIDFILE: $!";
… …
3591 3620
3592sub main { 3621sub main {
3593 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3594 3623
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599 3628
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601 3630
… …
3609 }; 3638 };
3610 3639
3611 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3612 3641
3613 cf::sync_job { 3642 cf::sync_job {
3614 cf::init_experience; 3643 cf::incloader::init ();
3644
3615 cf::init_anim; 3645 cf::init_anim;
3616 cf::init_attackmess; 3646 cf::init_attackmess;
3617 cf::init_dynamic; 3647 cf::init_dynamic;
3618 3648
3619 cf::load_settings; 3649 cf::load_settings;
3620 cf::load_materials;
3621 3650
3622 reload_resources; 3651 reload_resources;
3623 reload_config; 3652 reload_config;
3624 db_init; 3653 db_init;
3625 3654
… …
3637 3666
3638 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX (); 3668 use POSIX ();
3640 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};
3641 3670
3642 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3643 }; 3672 };
3644 3673
3645 cf::object::thawer::errors_are_fatal 0; 3674 cf::object::thawer::errors_are_fatal 0;
3646 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";
3647 3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3648 main_loop; 3682 goto &main_loop;
3649} 3683}
3650 3684
3651############################################################################# 3685#############################################################################
3652# initialisation and cleanup 3686# initialisation and cleanup
3653 3687
… …
3854 } 3888 }
3855} 3889}
3856 3890
3857sub do_reload_perl() { 3891sub do_reload_perl() {
3858 # can/must only be called in main 3892 # can/must only be called in main
3859 if (in_main) { 3893 unless (in_main) {
3860 error "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3861 return; 3895 return;
3862 } 3896 }
3863 3897
3864 return if $RELOAD++; 3898 return if $RELOAD++;
3865 3899
3866 my $t1 = AE::time; 3900 my $t1 = AE::time;
3867 3901
3868 while ($RELOAD) { 3902 while ($RELOAD) {
3903 cf::get_slot 0.1, -1, "reload_perl";
3869 info "reloading..."; 3904 info "perl_reload: reloading...";
3870 3905
3871 trace "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3872 3907
3873 cf::sync_job { 3908 cf::sync_job {
3874 cf::emergency_save; 3909 #cf::emergency_save;
3875 3910
3876 trace "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3877 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3878 %EXT_CORO = (); 3913 %EXT_CORO = ();
3879 3914
3880 trace "removing commands"; 3915 trace "perl_reload: removing commands";
3881 %COMMAND = (); 3916 %COMMAND = ();
3882 3917
3883 trace "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3884 %EXTCMD = (); 3919 %EXTCMD = ();
3885 %EXTICMD = (); 3920 %EXTICMD = ();
3886 3921
3887 trace "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3888 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3889 trace "... unloading $pkg"; 3924 trace "... unloading $pkg";
3890 3925
3891 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3892 eval { 3927 eval {
… …
3897 3932
3898 trace "... clearing $pkg"; 3933 trace "... clearing $pkg";
3899 clear_package $pkg; 3934 clear_package $pkg;
3900 } 3935 }
3901 3936
3902 trace "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3903 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3904 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3905 3940
3906 trace "... unloading $k"; 3941 trace "... unloading $k";
3907 delete $INC{$k}; 3942 delete $INC{$k};
… …
3914 } 3949 }
3915 3950
3916 clear_package $k; 3951 clear_package $k;
3917 } 3952 }
3918 3953
3919 trace "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3920 clear_package "safe::$_" 3955 clear_package "safe::$_"
3921 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);
3922 3957
3923 trace "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3924 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3925 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3926 3961
3927 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3928 # and global variables created in xs 3963 # and global variables created in xs
3929 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3930 3965
3931 info "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3932 3967
3933 trace "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3934 require cf; 3969 require cf;
3935 cf::_connect_to_perl_1; 3970 cf::_connect_to_perl_1;
3936 3971
3937 trace "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3938 cf::reload_config; 3973 cf::reload_config;
3939 3974
3940 trace "loading extensions"; 3975 trace "perl_reload: loading extensions";
3941 cf::load_extensions; 3976 cf::load_extensions;
3942 3977
3943 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3944 trace "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3945 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3946 trace "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3947 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3948 trace "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3949 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3950 } 3985 }
3951 3986
3952 trace "running post_init jobs"; 3987 cf::_post_init 1;
3953 (pop @POST_INIT)->(1) while @POST_INIT;
3954 3988
3955 trace "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3956 3990
3957 1 3991 1
3958 } or do { 3992 } or do {
3959 error $@; 3993 error $@;
3960 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3961 }; 3995 };
3962 3996
3963 info "reloaded";
3964 --$RELOAD; 3997 --$RELOAD;
3965 } 3998 }
3966 3999
3967 $t1 = AE::time - $t1; 4000 $t1 = AE::time - $t1;
3968 info "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3969}; 4002};
3970 4003
3971our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3972 4005
3973sub reload_perl() { 4006sub reload_perl() {
… …
3994 reload_perl; 4027 reload_perl;
3995 }; 4028 };
3996 } 4029 }
3997}; 4030};
3998 4031
3999unshift @INC, $LIBDIR; 4032#############################################################################
4000 4033
4001my $bug_warning = 0; 4034my $bug_warning = 0;
4002 4035
4003our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
4004our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
4005 4038
4006sub wait_for_tick { 4039sub wait_for_tick() {
4007 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4008 4041
4009 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
4010 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
4011 $signal->wait; 4044 $signal->wait;
4012} 4045}
4013 4046
4014sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
4015 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4016 4049
4017 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
4018 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
4019 $signal->wait; 4052 $signal->wait;
… …
4106 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
4107 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
4108 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
4109} 4142}
4110 4143
4111my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
4112 4146
4113sub _log_backtrace { 4147sub _log_backtrace {
4114 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
4115 4149
4116 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
4117 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4118 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
4119 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
4120 ++$_log_backtrace; 4158 ++$_log_backtrace;
4121 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
4122 async { 4160 async {
4123 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
4124 4162
… …
4144 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
4145 --$_log_backtrace; 4183 --$_log_backtrace;
4146 }; 4184 };
4147 } else { 4185 } else {
4148 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
4149 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4150 } 4188 }
4151} 4189}
4152 4190
4153# load additional modules 4191# load additional modules
4154require "cf/$_.pm" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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