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.532 by root, Thu Apr 29 07:32:34 2010 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49:18 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.
… …
518=cut 552=cut
519 553
520sub sync_job(&) { 554sub sync_job(&) {
521 my ($job) = @_; 555 my ($job) = @_;
522 556
523 if ($Coro::current == $Coro::main) { 557 if (in_main) {
524 my $time = AE::time; 558 my $time = AE::time;
525 559
526 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
527 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
528 562
529 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
530 564
531 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
532 566
533 my $busy = 1; 567 my $busy = 1;
534 my @res; 568 my @res;
… …
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 {
… …
657within each server. 695within each server.
658 696
659=cut 697=cut
660 698
661sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
662 my ($name) = @_; 703 my ($name) = @_;
663 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
664 705
665 eval { 706 eval {
666 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
676} 717}
677 718
678our $DB; 719our $DB;
679 720
680sub db_init { 721sub db_init {
681 cf::sync_job {
682 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
683 };
684} 723}
685 724
686sub db_get($$) { 725sub db_get($$) {
687 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
688 727
689 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
690 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
691 732
692 $! ? () 733 $! ? ()
693 : $data 734 : $data
694 }
695} 735}
696 736
697sub db_put($$$) { 737sub db_put($$$) {
698 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
1421 1461
1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1424 1464
1425 $ext{source} = 1465 $ext{source} =
1426 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1427 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1428 . $source 1468 . $source
1429 . "\n};\n1"; 1469 . "\n};\n1";
1430 1470
1431 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1639 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1640 1680
1641 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1642 $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
1643 1683
1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1645 $pl->deactivate; 1685 $pl->deactivate;
1686
1646 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;
1647 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1648 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1649 1692
1650 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1651 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1652 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1818sub generate_random_map { 1861sub generate_random_map {
1819 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1820 1863
1821 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
1822 1865
1823 # mit "rum" bekleckern, nicht
1824 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1828 $rmp->{exit_on_final_map},
1829 $rmp->{xsize}, $rmp->{ysize},
1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1832 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1833 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1834 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1835 (cf::region::find $rmp->{region}), $rmp->{custom}
1836 )
1837} 1867}
1838 1868
1839=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1840 1870
1841Register 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
… …
1846 1876
1847sub register { 1877sub register {
1848 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1849 my $pkg = caller; 1879 my $pkg = caller;
1850 1880
1851 no strict;
1852 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1853 1882
1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1855} 1884}
1856 1885
… …
1868} 1897}
1869 1898
1870sub normalise { 1899sub normalise {
1871 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1872 1901
1873 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1874 1903
1875 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1876 1905
1877 # map plan: 1906 # map plan:
1878 # 1907 #
… …
1893 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1894 $path = "$base/$path"; 1923 $path = "$base/$path";
1895 } 1924 }
1896 1925
1897 for ($path) { 1926 for ($path) {
1898 redo if s{//}{/};
1899 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1900 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1901 } 1929 }
1902 1930
1903 $path 1931 $path
… …
1917 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1918 return $self; 1946 return $self;
1919 } 1947 }
1920 } 1948 }
1921 1949
1922 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1923 () 1951 ()
1924} 1952}
1925 1953
1926sub init { 1954sub init {
1927 my ($self) = @_; 1955 my ($self) = @_;
… …
2049} 2077}
2050 2078
2051sub find; 2079sub find;
2052sub find { 2080sub find {
2053 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
2054 2084
2055 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
2056 2086
2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2143 2173
2144 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2145 } 2175 }
2146 2176
2147 $self->post_load; 2177 $self->post_load;
2178
2179 1
2148} 2180}
2149 2181
2150# customize the map for a given player, i.e. 2182# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player 2183# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath 2184# maps to change the path to ~playername/mappath
… …
2190} 2222}
2191 2223
2192sub find_sync { 2224sub find_sync {
2193 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2194 2226
2195 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2196} 2231}
2197 2232
2198sub do_load_sync { 2233sub do_load_sync {
2199 my ($map) = @_; 2234 my ($map) = @_;
2200 2235
2201 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2202 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2203 2238
2204 cf::sync_job { $map->load }; 2239 $map->load;
2205} 2240}
2206 2241
2207our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2208our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2209 2244
… …
3268 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3269 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3270 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3271 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3272) { 3307) {
3273 no strict 'refs';
3274 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3276 for @funs; 3310 for @funs;
3277} 3311}
3278 3312
… …
3365 3399
3366 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3367 3401
3368 trace "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3369 3403
3370 my $facedata;
3371 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3372 or die "$path: $!"; 3405 or die "$path: $!";
3373 3406
3374 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3375 3408
3376 $facedata->{version} == 2 3409 $facedata->{version} == 2
… …
3520} 3553}
3521 3554
3522sub reload_resources { 3555sub reload_resources {
3523 trace "reloading resource files...\n"; 3556 trace "reloading resource files...\n";
3524 3557
3558 reload_exp_table;
3559 reload_materials;
3525 reload_facedata; 3560 reload_facedata;
3526 reload_sound; 3561 reload_sound;
3527 reload_archetypes; 3562 reload_archetypes;
3528 reload_regions; 3563 reload_regions;
3529 reload_treasures; 3564 reload_treasures;
… …
3532} 3567}
3533 3568
3534sub reload_config { 3569sub reload_config {
3535 trace "reloading config file...\n"; 3570 trace "reloading config file...\n";
3536 3571
3537 open my $fh, "<:utf8", "$CONFDIR/config" 3572 0 < aio_load "$CONFDIR/config", my $config
3538 or return; 3573 or die "$CONFDIR/config: $!";
3539 3574
3540 local $/; 3575 utf8::decode $config;
3541 *CFG = YAML::XS::Load scalar <$fh>; 3576 *CFG = yaml_load $config;
3542 3577
3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3544 3579
3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3585 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3551 and die "WARNING: m(un)lockall failed: $!\n"; 3586 and die "WARNING: m(un)lockall failed: $!\n";
3552 }; 3587 };
3553 warn $@ if $@; 3588 warn $@ if $@;
3554 } 3589 }
3555
3556 trace "finished reloading resource files\n";
3557} 3590}
3558 3591
3559sub pidfile() { 3592sub pidfile() {
3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3593 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561 or die "$PIDFILE: $!"; 3594 or die "$PIDFILE: $!";
… …
3586 3619
3587sub main { 3620sub main {
3588 cf::init_globals; # initialise logging 3621 cf::init_globals; # initialise logging
3589 3622
3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594 3627
3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596 3629
… …
3604 }; 3637 };
3605 3638
3606 evthread_start IO::AIO::poll_fileno; 3639 evthread_start IO::AIO::poll_fileno;
3607 3640
3608 cf::sync_job { 3641 cf::sync_job {
3609 cf::init_experience; 3642 cf::incloader::init ();
3643
3610 cf::init_anim; 3644 cf::init_anim;
3611 cf::init_attackmess; 3645 cf::init_attackmess;
3612 cf::init_dynamic; 3646 cf::init_dynamic;
3613 3647
3614 cf::load_settings; 3648 cf::load_settings;
3615 cf::load_materials;
3616 3649
3617 reload_resources; 3650 reload_resources;
3618 reload_config; 3651 reload_config;
3619 db_init; 3652 db_init;
3620 3653
… …
3632 3665
3633 # no (long-running) fork's whatsoever before this point(!) 3666 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX (); 3667 use POSIX ();
3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3668 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636 3669
3637 (pop @POST_INIT)->(0) while @POST_INIT; 3670 cf::_post_init 0;
3638 }; 3671 };
3639 3672
3640 cf::object::thawer::errors_are_fatal 0; 3673 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n"; 3674 info "parse errors in files are no longer fatal from this point on.\n";
3642 3675
3676 my $free_main; $free_main = EV::idle sub {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :)
3679 };
3680
3643 main_loop; 3681 goto &main_loop;
3644} 3682}
3645 3683
3646############################################################################# 3684#############################################################################
3647# initialisation and cleanup 3685# initialisation and cleanup
3648 3686
… …
3747sub emergency_save() { 3785sub emergency_save() {
3748 my $freeze_guard = cf::freeze_mainloop; 3786 my $freeze_guard = cf::freeze_mainloop;
3749 3787
3750 info "emergency_perl_save: enter\n"; 3788 info "emergency_perl_save: enter\n";
3751 3789
3790 # this is a trade-off: we want to be very quick here, so
3791 # save all maps without fsync, and later call a global sync
3792 # (which in turn might be very very slow)
3793 local $USE_FSYNC = 0;
3794
3752 cf::sync_job { 3795 cf::sync_job {
3753 # this is a trade-off: we want to be very quick here, so 3796 cf::write_runtime_sync; # external watchdog should not bark
3754 # save all maps without fsync, and later call a global sync
3755 # (which in turn might be very very slow)
3756 local $USE_FSYNC = 0;
3757 3797
3758 # use a peculiar iteration method to avoid tripping on perl 3798 # use a peculiar iteration method to avoid tripping on perl
3759 # refcount bugs in for. also avoids problems with players 3799 # refcount bugs in for. also avoids problems with players
3760 # and maps saved/destroyed asynchronously. 3800 # and maps saved/destroyed asynchronously.
3761 info "emergency_perl_save: begin player save\n"; 3801 info "emergency_perl_save: begin player save\n";
… …
3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3805 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3766 $pl->save; 3806 $pl->save;
3767 } 3807 }
3768 info "emergency_perl_save: end player save\n"; 3808 info "emergency_perl_save: end player save\n";
3769 3809
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3770 info "emergency_perl_save: begin map save\n"; 3812 info "emergency_perl_save: begin map save\n";
3771 for my $path (keys %cf::MAP) { 3813 for my $path (keys %cf::MAP) {
3772 my $map = $cf::MAP{$path} or next; 3814 my $map = $cf::MAP{$path} or next;
3773 $map->valid or next; 3815 $map->valid or next;
3774 $map->save; 3816 $map->save;
3775 } 3817 }
3776 info "emergency_perl_save: end map save\n"; 3818 info "emergency_perl_save: end map save\n";
3777 3819
3820 cf::write_runtime_sync; # external watchdog should not bark
3821
3778 info "emergency_perl_save: begin database checkpoint\n"; 3822 info "emergency_perl_save: begin database checkpoint\n";
3779 BDB::db_env_txn_checkpoint $DB_ENV; 3823 BDB::db_env_txn_checkpoint $DB_ENV;
3780 info "emergency_perl_save: end database checkpoint\n"; 3824 info "emergency_perl_save: end database checkpoint\n";
3781 3825
3782 info "emergency_perl_save: begin write uuid\n"; 3826 info "emergency_perl_save: begin write uuid\n";
3783 write_uuid_sync 1; 3827 write_uuid_sync 1;
3784 info "emergency_perl_save: end write uuid\n"; 3828 info "emergency_perl_save: end write uuid\n";
3785 };
3786 3829
3830 cf::write_runtime_sync; # external watchdog should not bark
3831
3832 trace "emergency_perl_save: syncing database to disk";
3833 BDB::db_env_txn_checkpoint $DB_ENV;
3834
3787 info "emergency_perl_save: starting sync()\n"; 3835 info "emergency_perl_save: starting sync\n";
3788 IO::AIO::aio_sync sub { 3836 IO::AIO::aio_sync sub {
3789 info "emergency_perl_save: finished sync()\n"; 3837 info "emergency_perl_save: finished sync\n";
3838 };
3839
3840 cf::write_runtime_sync; # external watchdog should not bark
3841
3842 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) {
3844 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3845 }
3846
3847 cf::write_runtime_sync; # external watchdog should not bark
3790 }; 3848 };
3791 3849
3792 info "emergency_perl_save: leave\n"; 3850 info "emergency_perl_save: leave\n";
3793} 3851}
3794 3852
3795sub post_cleanup { 3853sub post_cleanup {
3796 my ($make_core) = @_; 3854 my ($make_core) = @_;
3855
3856 IO::AIO::flush;
3797 3857
3798 error Carp::longmess "post_cleanup backtrace" 3858 error Carp::longmess "post_cleanup backtrace"
3799 if $make_core; 3859 if $make_core;
3800 3860
3801 my $fh = pidfile; 3861 my $fh = pidfile;
… …
3827 } 3887 }
3828} 3888}
3829 3889
3830sub do_reload_perl() { 3890sub do_reload_perl() {
3831 # can/must only be called in main 3891 # can/must only be called in main
3832 if (in_main) { 3892 unless (in_main) {
3833 error "can only reload from main coroutine"; 3893 error "can only reload from main coroutine";
3834 return; 3894 return;
3835 } 3895 }
3836 3896
3837 return if $RELOAD++; 3897 return if $RELOAD++;
3838 3898
3839 my $t1 = AE::time; 3899 my $t1 = AE::time;
3840 3900
3841 while ($RELOAD) { 3901 while ($RELOAD) {
3902 cf::get_slot 0.1, -1, "reload_perl";
3842 info "reloading..."; 3903 info "perl_reload: reloading...";
3843 3904
3844 trace "entering sync_job"; 3905 trace "perl_reload: entering sync_job";
3845 3906
3846 cf::sync_job { 3907 cf::sync_job {
3847 cf::write_runtime_sync; # external watchdog should not bark
3848 cf::emergency_save; 3908 #cf::emergency_save;
3849 cf::write_runtime_sync; # external watchdog should not bark
3850 3909
3851 trace "syncing database to disk";
3852 BDB::db_env_txn_checkpoint $DB_ENV;
3853
3854 # if anything goes wrong in here, we should simply crash as we already saved
3855
3856 trace "flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 trace "cancelling all extension coros"; 3910 trace "perl_reload: cancelling all extension coros";
3862 $_->cancel for values %EXT_CORO; 3911 $_->cancel for values %EXT_CORO;
3863 %EXT_CORO = (); 3912 %EXT_CORO = ();
3864 3913
3865 trace "removing commands"; 3914 trace "perl_reload: removing commands";
3866 %COMMAND = (); 3915 %COMMAND = ();
3867 3916
3868 trace "removing ext/exti commands"; 3917 trace "perl_reload: removing ext/exti commands";
3869 %EXTCMD = (); 3918 %EXTCMD = ();
3870 %EXTICMD = (); 3919 %EXTICMD = ();
3871 3920
3872 trace "unloading/nuking all extensions"; 3921 trace "perl_reload: unloading/nuking all extensions";
3873 for my $pkg (@EXTS) { 3922 for my $pkg (@EXTS) {
3874 trace "... unloading $pkg"; 3923 trace "... unloading $pkg";
3875 3924
3876 if (my $cb = $pkg->can ("unload")) { 3925 if (my $cb = $pkg->can ("unload")) {
3877 eval { 3926 eval {
… …
3882 3931
3883 trace "... clearing $pkg"; 3932 trace "... clearing $pkg";
3884 clear_package $pkg; 3933 clear_package $pkg;
3885 } 3934 }
3886 3935
3887 trace "unloading all perl modules loaded from $LIBDIR"; 3936 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3888 while (my ($k, $v) = each %INC) { 3937 while (my ($k, $v) = each %INC) {
3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890 3939
3891 trace "... unloading $k"; 3940 trace "... unloading $k";
3892 delete $INC{$k}; 3941 delete $INC{$k};
… …
3899 } 3948 }
3900 3949
3901 clear_package $k; 3950 clear_package $k;
3902 } 3951 }
3903 3952
3904 trace "getting rid of safe::, as good as possible"; 3953 trace "perl_reload: getting rid of safe::, as good as possible";
3905 clear_package "safe::$_" 3954 clear_package "safe::$_"
3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3907 3956
3908 trace "unloading cf.pm \"a bit\""; 3957 trace "perl_reload: unloading cf.pm \"a bit\"";
3909 delete $INC{"cf.pm"}; 3958 delete $INC{"cf.pm"};
3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3959 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3911 3960
3912 # don't, removes xs symbols, too, 3961 # don't, removes xs symbols, too,
3913 # and global variables created in xs 3962 # and global variables created in xs
3914 #clear_package __PACKAGE__; 3963 #clear_package __PACKAGE__;
3915 3964
3916 info "unload completed, starting to reload now"; 3965 info "perl_reload: unload completed, starting to reload now";
3917 3966
3918 trace "reloading cf.pm"; 3967 trace "perl_reload: reloading cf.pm";
3919 require cf; 3968 require cf;
3920 cf::_connect_to_perl_1; 3969 cf::_connect_to_perl_1;
3921 3970
3922 trace "loading config and database again"; 3971 trace "perl_reload: loading config and database again";
3923 cf::reload_config; 3972 cf::reload_config;
3924 3973
3925 trace "loading extensions"; 3974 trace "perl_reload: loading extensions";
3926 cf::load_extensions; 3975 cf::load_extensions;
3927 3976
3928 if ($REATTACH_ON_RELOAD) { 3977 if ($REATTACH_ON_RELOAD) {
3929 trace "reattaching attachments to objects/players"; 3978 trace "perl_reload: reattaching attachments to objects/players";
3930 _global_reattach; # objects, sockets 3979 _global_reattach; # objects, sockets
3931 trace "reattaching attachments to maps"; 3980 trace "perl_reload: reattaching attachments to maps";
3932 reattach $_ for values %MAP; 3981 reattach $_ for values %MAP;
3933 trace "reattaching attachments to players"; 3982 trace "perl_reload: reattaching attachments to players";
3934 reattach $_ for values %PLAYER; 3983 reattach $_ for values %PLAYER;
3935 } 3984 }
3936 3985
3937 trace "running post_init jobs"; 3986 cf::_post_init 1;
3938 (pop @POST_INIT)->(1) while @POST_INIT;
3939 3987
3940 trace "leaving sync_job"; 3988 trace "perl_reload: leaving sync_job";
3941 3989
3942 1 3990 1
3943 } or do { 3991 } or do {
3944 error $@; 3992 error $@;
3945 cf::cleanup "error while reloading, exiting."; 3993 cf::cleanup "perl_reload: error, exiting.";
3946 }; 3994 };
3947 3995
3948 info "reloaded";
3949 --$RELOAD; 3996 --$RELOAD;
3950 } 3997 }
3951 3998
3952 $t1 = AE::time - $t1; 3999 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n"; 4000 info "perl_reload: completed in ${t1}s\n";
3954}; 4001};
3955 4002
3956our $RELOAD_WATCHER; # used only during reload 4003our $RELOAD_WATCHER; # used only during reload
3957 4004
3958sub reload_perl() { 4005sub reload_perl() {
… …
3979 reload_perl; 4026 reload_perl;
3980 }; 4027 };
3981 } 4028 }
3982}; 4029};
3983 4030
3984unshift @INC, $LIBDIR; 4031#############################################################################
3985 4032
3986my $bug_warning = 0; 4033my $bug_warning = 0;
3987 4034
3988our @WAIT_FOR_TICK; 4035our @WAIT_FOR_TICK;
3989our @WAIT_FOR_TICK_BEGIN; 4036our @WAIT_FOR_TICK_BEGIN;
3990 4037
3991sub wait_for_tick { 4038sub wait_for_tick() {
3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3993 4040
3994 my $signal = new Coro::Signal; 4041 my $signal = new Coro::Signal;
3995 push @WAIT_FOR_TICK, $signal; 4042 push @WAIT_FOR_TICK, $signal;
3996 $signal->wait; 4043 $signal->wait;
3997} 4044}
3998 4045
3999sub wait_for_tick_begin { 4046sub wait_for_tick_begin() {
4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4001 4048
4002 my $signal = new Coro::Signal; 4049 my $signal = new Coro::Signal;
4003 push @WAIT_FOR_TICK_BEGIN, $signal; 4050 push @WAIT_FOR_TICK_BEGIN, $signal;
4004 $signal->wait; 4051 $signal->wait;
… …
4091 IO::AIO::min_parallel 8; 4138 IO::AIO::min_parallel 8;
4092 IO::AIO::max_poll_time $TICK * 0.1; 4139 IO::AIO::max_poll_time $TICK * 0.1;
4093 undef $AnyEvent::AIO::WATCHER; 4140 undef $AnyEvent::AIO::WATCHER;
4094} 4141}
4095 4142
4096my $_log_backtrace; 4143our $_log_backtrace;
4144our $_log_backtrace_last;
4097 4145
4098sub _log_backtrace { 4146sub _log_backtrace {
4099 my ($msg, @addr) = @_; 4147 my ($msg, @addr) = @_;
4100 4148
4101 $msg =~ s/\n//; 4149 $msg =~ s/\n$//;
4102 4150
4151 if ($_log_backtrace_last eq $msg) {
4152 LOG llevInfo, "[ABT] $msg\n";
4153 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4103 # limit the # of concurrent backtraces 4154 # limit the # of concurrent backtraces
4104 if ($_log_backtrace < 2) { 4155 } elsif ($_log_backtrace < 2) {
4156 $_log_backtrace_last = $msg;
4105 ++$_log_backtrace; 4157 ++$_log_backtrace;
4106 my $perl_bt = Carp::longmess $msg; 4158 my $perl_bt = Carp::longmess $msg;
4107 async { 4159 async {
4108 $Coro::current->{desc} = "abt $msg"; 4160 $Coro::current->{desc} = "abt $msg";
4109 4161
… …
4129 LOG llevInfo, "[ABT] $_\n" for @bt; 4181 LOG llevInfo, "[ABT] $_\n" for @bt;
4130 --$_log_backtrace; 4182 --$_log_backtrace;
4131 }; 4183 };
4132 } else { 4184 } else {
4133 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $msg\n";
4134 LOG llevInfo, "[ABT] [suppressed]\n"; 4186 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4135 } 4187 }
4136} 4188}
4137 4189
4138# load additional modules 4190# load additional modules
4139require "cf/$_.pm" for @EXTRA_MODULES; 4191require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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