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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC vs.
Revision 1.544 by root, Thu May 6 21:58:07 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;
… …
1451 1451
1452 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1453 1453
1454 if (length $@) { 1454 if (length $@) {
1455 error "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1457 1456
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1459 if exists $v->{meta}{mandatory}; 1458 if exists $v->{meta}{mandatory};
1460 1459
1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1870} 1869}
1871 1870
1872sub normalise { 1871sub normalise {
1873 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1874 1873
1875 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1876 1875
1877 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1878 1877
1879 # map plan: 1878 # map plan:
1880 # 1879 #
… …
1919 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1920 return $self; 1919 return $self;
1921 } 1920 }
1922 } 1921 }
1923 1922
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 1924 ()
1926} 1925}
1927 1926
1928sub init { 1927sub init {
1929 my ($self) = @_; 1928 my ($self) = @_;
… …
2051} 2050}
2052 2051
2053sub find; 2052sub find;
2054sub find { 2053sub find {
2055 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
2055
2056 cf::cede_to_tick;
2056 2057
2057 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
2058 2059
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
… …
3358=cut 3359=cut
3359 3360
3360############################################################################# 3361#############################################################################
3361# the server's init and main functions 3362# the server's init and main functions
3362 3363
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3405
3406sub load_facedata($) { 3364sub load_facedata($) {
3407 my ($path) = @_; 3365 my ($path) = @_;
3408 3366
3409 # HACK to clear player env face cache, we need some signal framework 3367 # HACK to clear player env face cache, we need some signal framework
3410 # for this (global event?) 3368 # for this (global event?)
… …
3541sub reload_treasures { 3499sub reload_treasures {
3542 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3543 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3544} 3502}
3545 3503
3504sub reload_exp {
3505 cf::init_experience;
3506}
3507
3546sub reload_sound { 3508sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n"; 3509 trace "loading sound config from $DATADIR/sound\n";
3548 3510
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data 3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!"; 3512 or die "$DATADIR/sound $!";
… …
3567} 3529}
3568 3530
3569sub reload_resources { 3531sub reload_resources {
3570 trace "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3571 3533
3534 reload_exp;
3572 reload_facedata; 3535 reload_facedata;
3573 reload_sound; 3536 reload_sound;
3574 reload_archetypes; 3537 reload_archetypes;
3575 reload_regions; 3538 reload_regions;
3576 reload_treasures; 3539 reload_treasures;
… …
3651 }; 3614 };
3652 3615
3653 evthread_start IO::AIO::poll_fileno; 3616 evthread_start IO::AIO::poll_fileno;
3654 3617
3655 cf::sync_job { 3618 cf::sync_job {
3656 init_inc; 3619 cf::incloader::init ();
3657 3620
3658 cf::init_experience;
3659 cf::init_anim; 3621 cf::init_anim;
3660 cf::init_attackmess; 3622 cf::init_attackmess;
3661 cf::init_dynamic; 3623 cf::init_dynamic;
3662 3624
3663 cf::load_settings; 3625 cf::load_settings;
… …
3903 } 3865 }
3904} 3866}
3905 3867
3906sub do_reload_perl() { 3868sub do_reload_perl() {
3907 # can/must only be called in main 3869 # can/must only be called in main
3908 if (in_main) { 3870 unless (in_main) {
3909 error "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3910 return; 3872 return;
3911 } 3873 }
3912 3874
3913 return if $RELOAD++; 3875 return if $RELOAD++;
3914 3876
3915 my $t1 = AE::time; 3877 my $t1 = AE::time;
3916 3878
3917 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3918 info "reloading..."; 3881 info "reloading...";
3919 3882
3920 trace "entering sync_job"; 3883 trace "entering sync_job";
3921 3884
3922 cf::sync_job { 3885 cf::sync_job {
3923 cf::emergency_save; 3886 #cf::emergency_save;
3924 3887
3925 trace "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3926 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3927 %EXT_CORO = (); 3890 %EXT_CORO = ();
3928 3891

Diff Legend

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