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.538 by root, Tue May 4 21:45:43 2010 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 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 = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME;
… …
233from wherever your confdir points to. 235from wherever your confdir points to.
234 236
235=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
236 238
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These 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 240returns 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. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
240 247
241=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
242 249
243This array contains the results of the last C<invoke ()> call. When 250This 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 251C<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 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 360
354sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
356 363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
357=item cf::post_init { BLOCK } 376=item cf::post_init { BLOCK }
358 377
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 379but I<before> the server starts ticking again.
361 380
362The cdoeblock will have a single boolean argument to indicate whether this 381The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 382is a reload or not.
364 383
365=cut 384=cut
366 385
367sub post_init(&) { 386sub post_init(&) {
368 push @POST_INIT, shift; 387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
369} 405}
370 406
371=item cf::lock_wait $string 407=item cf::lock_wait $string
372 408
373Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
… …
578 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
579 615
580 $coro 616 $coro
581} 617}
582 618
583=item fork_call { }, $args 619=item fork_call { }, @args
584 620
585Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 624never block itself or use any form of event handling.
589 625
590=cut 626=cut
591 627
628sub post_fork {
629 reset_signals;
630}
631
592sub fork_call(&@) { 632sub fork_call(&@) {
593 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
594 634
595 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
598 638
599 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
600 reset_signals; 640 cf::post_fork;
601 &$cb 641 &$cb
602 }, @args; 642 } @args;
603 643
604 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
605} 645}
606 646
607sub objinfo { 647sub objinfo {
… …
1451 1491
1452 my $active = eval $v->{source}; 1492 my $active = eval $v->{source};
1453 1493
1454 if (length $@) { 1494 if (length $@) {
1455 error "$v->{path}: $@\n"; 1495 error "$v->{path}: $@\n";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1457 1496
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1459 if exists $v->{meta}{mandatory}; 1498 if exists $v->{meta}{mandatory};
1460 1499
1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1642 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1643 1682
1644 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1646 1685
1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1648 $pl->deactivate; 1687 $pl->deactivate;
1688
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1650 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1651 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1652 1694
1653 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1654 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1655 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
… …
1821sub generate_random_map { 1863sub generate_random_map {
1822 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1823 1865
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825 1867
1826 # mit "rum" bekleckern, nicht
1827 $self->_create_random_map ( 1868 $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} 1869}
1841 1870
1842=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1843 1872
1844Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
… …
1849 1878
1850sub register { 1879sub register {
1851 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1852 my $pkg = caller; 1881 my $pkg = caller;
1853 1882
1854 no strict;
1855 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1856 1884
1857 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1858} 1886}
1859 1887
… …
1871} 1899}
1872 1900
1873sub normalise { 1901sub normalise {
1874 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1875 1903
1876 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1877 1905
1878 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1879 1907
1880 # map plan: 1908 # map plan:
1881 # 1909 #
… …
1896 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1897 $path = "$base/$path"; 1925 $path = "$base/$path";
1898 } 1926 }
1899 1927
1900 for ($path) { 1928 for ($path) {
1901 redo if s{//}{/};
1902 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1903 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1904 } 1931 }
1905 1932
1906 $path 1933 $path
… …
1920 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1921 return $self; 1948 return $self;
1922 } 1949 }
1923 } 1950 }
1924 1951
1925 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1926 () 1953 ()
1927} 1954}
1928 1955
1929sub init { 1956sub init {
1930 my ($self) = @_; 1957 my ($self) = @_;
… …
2052} 2079}
2053 2080
2054sub find; 2081sub find;
2055sub find { 2082sub find {
2056 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2084
2085 cf::cede_to_tick;
2057 2086
2058 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
2059 2088
2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061 my $guard2 = cf::lock_acquire "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2146 2175
2147 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2148 } 2177 }
2149 2178
2150 $self->post_load; 2179 $self->post_load;
2180
2181 1
2151} 2182}
2152 2183
2153# customize the map for a given player, i.e. 2184# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player 2185# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath 2186# maps to change the path to ~playername/mappath
… …
3274 decrease split destroy change_exp value msg lore send_msg)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3275 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3276 ["cf::player" => qw(peaceful send_msg)], 3307 ["cf::player" => qw(peaceful send_msg)],
3277 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3278) { 3309) {
3279 no strict 'refs';
3280 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3281 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3282 for @funs; 3312 for @funs;
3283} 3313}
3284 3314
… …
3371 3401
3372 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3373 3403
3374 trace "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3375 3405
3376 my $facedata;
3377 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3378 or die "$path: $!"; 3407 or die "$path: $!";
3379 3408
3380 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3381 3410
3382 $facedata->{version} == 2 3411 $facedata->{version} == 2
… …
3399 3428
3400 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3401 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3402 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3403 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3404 3434
3405 cf::cede_to_tick; 3435 cf::cede_to_tick;
3406 } 3436 }
3407 3437
3408 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
… …
3526} 3556}
3527 3557
3528sub reload_resources { 3558sub reload_resources {
3529 trace "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3530 3560
3561 reload_exp_table;
3562 reload_materials;
3531 reload_facedata; 3563 reload_facedata;
3532 reload_sound; 3564 reload_sound;
3533 reload_archetypes; 3565 reload_archetypes;
3534 reload_regions; 3566 reload_regions;
3535 reload_treasures; 3567 reload_treasures;
… …
3538} 3570}
3539 3571
3540sub reload_config { 3572sub reload_config {
3541 trace "reloading config file...\n"; 3573 trace "reloading config file...\n";
3542 3574
3543 open my $fh, "<:utf8", "$CONFDIR/config" 3575 0 < aio_load "$CONFDIR/config", my $config
3544 or return; 3576 or die "$CONFDIR/config: $!";
3545 3577
3546 local $/; 3578 utf8::decode $config;
3547 *CFG = YAML::XS::Load scalar <$fh>; 3579 *CFG = yaml_load $config;
3548 3580
3549 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3550 3582
3551 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3552 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3556 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3588 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3557 and die "WARNING: m(un)lockall failed: $!\n"; 3589 and die "WARNING: m(un)lockall failed: $!\n";
3558 }; 3590 };
3559 warn $@ if $@; 3591 warn $@ if $@;
3560 } 3592 }
3561
3562 trace "finished reloading resource files\n";
3563} 3593}
3564 3594
3565sub pidfile() { 3595sub pidfile() {
3566 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3567 or die "$PIDFILE: $!"; 3597 or die "$PIDFILE: $!";
… …
3592 3622
3593sub main { 3623sub main {
3594 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3595 3625
3596 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3597 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3598 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3599 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3600 3630
3601 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3602 3632
… …
3610 }; 3640 };
3611 3641
3612 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3613 3643
3614 cf::sync_job { 3644 cf::sync_job {
3615 cf::init_experience; 3645 cf::incloader::init ();
3646
3616 cf::init_anim; 3647 cf::init_anim;
3617 cf::init_attackmess; 3648 cf::init_attackmess;
3618 cf::init_dynamic; 3649 cf::init_dynamic;
3619 3650
3620 cf::load_settings; 3651 cf::load_settings;
3621 cf::load_materials;
3622 3652
3623 reload_resources; 3653 reload_resources;
3624 reload_config; 3654 reload_config;
3625 db_init; 3655 db_init;
3626 3656
… …
3638 3668
3639 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3640 use POSIX (); 3670 use POSIX ();
3641 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3642 3672
3643 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3644 }; 3674 };
3645 3675
3646 cf::object::thawer::errors_are_fatal 0; 3676 cf::object::thawer::errors_are_fatal 0;
3647 info "parse errors in files are no longer fatal from this point on.\n"; 3677 info "parse errors in files are no longer fatal from this point on.\n";
3648 3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3649 main_loop; 3684 goto &main_loop;
3650} 3685}
3651 3686
3652############################################################################# 3687#############################################################################
3653# initialisation and cleanup 3688# initialisation and cleanup
3654 3689
… …
3855 } 3890 }
3856} 3891}
3857 3892
3858sub do_reload_perl() { 3893sub do_reload_perl() {
3859 # can/must only be called in main 3894 # can/must only be called in main
3860 if (in_main) { 3895 unless (in_main) {
3861 error "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3862 return; 3897 return;
3863 } 3898 }
3864 3899
3865 return if $RELOAD++; 3900 return if $RELOAD++;
3866 3901
3867 my $t1 = AE::time; 3902 my $t1 = AE::time;
3868 3903
3869 while ($RELOAD) { 3904 while ($RELOAD) {
3905 cf::get_slot 0.1, -1, "reload_perl";
3870 info "reloading..."; 3906 info "perl_reload: reloading...";
3871 3907
3872 trace "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3873 3909
3874 cf::sync_job { 3910 cf::sync_job {
3875 cf::emergency_save; 3911 #cf::emergency_save;
3876 3912
3877 trace "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3878 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3879 %EXT_CORO = (); 3915 %EXT_CORO = ();
3880 3916
3881 trace "removing commands"; 3917 trace "perl_reload: removing commands";
3882 %COMMAND = (); 3918 %COMMAND = ();
3883 3919
3884 trace "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3885 %EXTCMD = (); 3921 %EXTCMD = ();
3886 %EXTICMD = (); 3922 %EXTICMD = ();
3887 3923
3888 trace "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3889 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3890 trace "... unloading $pkg"; 3926 trace "... unloading $pkg";
3891 3927
3892 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3893 eval { 3929 eval {
… …
3898 3934
3899 trace "... clearing $pkg"; 3935 trace "... clearing $pkg";
3900 clear_package $pkg; 3936 clear_package $pkg;
3901 } 3937 }
3902 3938
3903 trace "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3904 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3905 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3906 3942
3907 trace "... unloading $k"; 3943 trace "... unloading $k";
3908 delete $INC{$k}; 3944 delete $INC{$k};
… …
3915 } 3951 }
3916 3952
3917 clear_package $k; 3953 clear_package $k;
3918 } 3954 }
3919 3955
3920 trace "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3921 clear_package "safe::$_" 3957 clear_package "safe::$_"
3922 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3923 3959
3924 trace "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3925 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3926 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3927 3963
3928 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3929 # and global variables created in xs 3965 # and global variables created in xs
3930 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3931 3967
3932 info "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3933 3969
3934 trace "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3935 require cf; 3971 require cf;
3936 cf::_connect_to_perl_1; 3972 cf::_connect_to_perl_1;
3937 3973
3938 trace "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3939 cf::reload_config; 3975 cf::reload_config;
3940 3976
3941 trace "loading extensions"; 3977 trace "perl_reload: loading extensions";
3942 cf::load_extensions; 3978 cf::load_extensions;
3943 3979
3944 if ($REATTACH_ON_RELOAD) { 3980 if ($REATTACH_ON_RELOAD) {
3945 trace "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3946 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3947 trace "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3948 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3949 trace "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3950 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3951 } 3987 }
3952 3988
3953 trace "running post_init jobs"; 3989 cf::_post_init 1;
3954 (pop @POST_INIT)->(1) while @POST_INIT;
3955 3990
3956 trace "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3957 3992
3958 1 3993 1
3959 } or do { 3994 } or do {
3960 error $@; 3995 error $@;
3961 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3962 }; 3997 };
3963 3998
3964 info "reloaded";
3965 --$RELOAD; 3999 --$RELOAD;
3966 } 4000 }
3967 4001
3968 $t1 = AE::time - $t1; 4002 $t1 = AE::time - $t1;
3969 info "reload completed in ${t1}s\n"; 4003 info "perl_reload: completed in ${t1}s\n";
3970}; 4004};
3971 4005
3972our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3973 4007
3974sub reload_perl() { 4008sub reload_perl() {
… …
3995 reload_perl; 4029 reload_perl;
3996 }; 4030 };
3997 } 4031 }
3998}; 4032};
3999 4033
4000unshift @INC, $LIBDIR; 4034#############################################################################
4001 4035
4002my $bug_warning = 0; 4036my $bug_warning = 0;
4003 4037
4004our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
4005our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
4006 4040
4007sub wait_for_tick { 4041sub wait_for_tick() {
4008 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4009 4043
4010 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
4011 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
4012 $signal->wait; 4046 $signal->wait;
4013} 4047}
4014 4048
4015sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
4016 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4017 4051
4018 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
4019 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
4020 $signal->wait; 4054 $signal->wait;
… …
4107 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
4108 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
4109 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
4110} 4144}
4111 4145
4112my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
4113 4148
4114sub _log_backtrace { 4149sub _log_backtrace {
4115 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
4116 4151
4117 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
4118 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4119 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
4120 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
4121 ++$_log_backtrace; 4160 ++$_log_backtrace;
4122 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
4123 async { 4162 async {
4124 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
4125 4164
… …
4145 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
4146 --$_log_backtrace; 4185 --$_log_backtrace;
4147 }; 4186 };
4148 } else { 4187 } else {
4149 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
4150 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4151 } 4190 }
4152} 4191}
4153 4192
4154# load additional modules 4193# load additional modules
4155require "cf/$_.pm" for @EXTRA_MODULES; 4194require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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