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.273 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.278 by root, Mon Jun 11 21:38:14 2007 UTC

423 or return; 423 or return;
424 424
425 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
426 and return; 426 and return;
427 427
428 warn "runtime file written.\n";#d# 428 warn "runtime file written.\n";
429 429
430 1 430 1
431} 431}
432 432
433=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
873 or return; 873 or return;
874 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
875 } 875 }
876 876
877 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
878 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
879 return ($data, $av); 879 return ($data, $av);
880} 880}
881 881
882############################################################################# 882#############################################################################
883# command handling &c 883# command handling &c
943 943
944 cf::override; 944 cf::override;
945 }, 945 },
946); 946);
947 947
948sub load_extension {
949 my ($path) = @_;
950
951 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
952 my $base = $1;
953 my $pkg = $1;
954 $pkg =~ s/[^[:word:]]/_/g;
955 $pkg = "ext::$pkg";
956
957 warn "... loading '$path' into '$pkg'\n";
958
959 open my $fh, "<:utf8", $path
960 or die "$path: $!";
961
962 my $source =
963 "package $pkg; use strict; use utf8;\n"
964 . "#line 1 \"$path\"\n{\n"
965 . (do { local $/; <$fh> })
966 . "\n};\n1";
967
968 unless (eval $source) {
969 my $msg = $@ ? "$path: $@\n"
970 : "extension disabled.\n";
971 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972 warn $@;
973 warn "mandatory extension failed to load, exiting.\n";
974 exit 1;
975 }
976 die $@;
977 }
978
979 push @EXTS, $pkg;
980}
981
982sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
983 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 953 next unless -r $path;
985 eval { 954
986 load_extension $ext; 955 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
956 my $base = $1;
957 my $pkg = $1;
958 $pkg =~ s/[^[:word:]]/_/g;
959 $pkg = "ext::$pkg";
960
961 open my $fh, "<:utf8", $path
962 or die "$path: $!";
963
964 my $source = do { local $/; <$fh> };
965
966 my %ext = (
967 path => $path,
968 base => $base,
969 pkg => $pkg,
970 );
971
972 $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/;
974
975 $ext{source} =
976 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n"
978 . $source
979 . "\n};\n1";
980
981 $todo{$base} = \%ext;
982 }
983
984 my %done;
985 while (%todo) {
986 my $progress;
987
988 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $ext{meta}{depends}) {
990 goto skip
991 unless exists $done{$_};
992 }
993
994 warn "... loading '$k' into '$v->{pkg}'\n";
995
996 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n"
998 : "extension disabled.\n";
999
1000 if (exists $v->{meta}{mandatory}) {
1001 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1;
1004 }
1005
1006 die $msg;
1007 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
987 1 1011 }
988 } or warn "$ext not loaded: $@"; 1012
1013 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress;
1016 }
989 } 1017 };
990} 1018}
991 1019
992############################################################################# 1020#############################################################################
993 1021
994=head2 CORE EXTENSIONS 1022=head2 CORE EXTENSIONS
1305 my ($self, $merge) = @_; 1333 my ($self, $merge) = @_;
1306 1334
1307 # we have to keep some variables in memory intact 1335 # we have to keep some variables in memory intact
1308 local $self->{path}; 1336 local $self->{path};
1309 local $self->{load_path}; 1337 local $self->{load_path};
1310 local $self->{deny_save};
1311 local $self->{deny_reset};
1312 1338
1313 $self->SUPER::thawer_merge ($merge); 1339 $self->SUPER::thawer_merge ($merge);
1314} 1340}
1315 1341
1316sub normalise { 1342sub normalise {
1416 1442
1417 $_->change_map_light ($change) 1443 $_->change_map_light ($change)
1418 for grep $_->outdoor, values %cf::MAP; 1444 for grep $_->outdoor, values %cf::MAP;
1419} 1445}
1420 1446
1447sub decay_objects {
1448 my ($self) = @_;
1449
1450 return if $self->{deny_reset};
1451
1452 $self->do_decay_objects;
1453}
1454
1421sub unlink_save { 1455sub unlink_save {
1422 my ($self) = @_; 1456 my ($self) = @_;
1423 1457
1424 utf8::encode (my $save = $self->save_path); 1458 utf8::encode (my $save = $self->save_path);
1425 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1459 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1481 $self->load_header_orig 1515 $self->load_header_orig
1482 or return; 1516 or return;
1483 $self->prepare_orig; 1517 $self->prepare_orig;
1484 } 1518 }
1485 1519
1520 $self->{deny_reset} = 1
1521 if $self->no_reset;
1522
1486 $self->default_region (cf::region::find_by_path $self->{path}) 1523 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region; 1524 unless $self->default_region;
1488 1525
1489 1 1526 1
1490} 1527}
1505 $map->{last_save} = $cf::RUNTIME; 1542 $map->{last_save} = $cf::RUNTIME;
1506 1543
1507 $map->load_header 1544 $map->load_header
1508 or return; 1545 or return;
1509 1546
1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously 1548 # doing this can freeze the server in a sync job, obviously
1512 #$cf::WAIT_FOR_TICK->wait; 1549 #$cf::WAIT_FOR_TICK->wait;
1513 $map->reset; 1550 $map->reset;
1514 undef $guard; 1551 undef $guard;
1515 return find $path; 1552 return find $path;
1582 my ($self, $ob) = @_; 1619 my ($self, $ob) = @_;
1583 1620
1584 return find "~" . $ob->name . "/" . $self->{path} 1621 return find "~" . $ob->name . "/" . $self->{path}
1585 if $self->per_player; 1622 if $self->per_player;
1586 1623
1624# return find "?party/" . $ob->name . "/" . $self->{path}
1625# if $self->per_party;
1626
1587 $self 1627 $self
1588} 1628}
1589 1629
1590# find and load all maps in the 3x3 area around a map 1630# find and load all maps in the 3x3 area around a map
1591sub load_diag { 1631sub load_diag {
1701 1741
1702sub reset_at { 1742sub reset_at {
1703 my ($self) = @_; 1743 my ($self) = @_;
1704 1744
1705 # TODO: safety, remove and allow resettable per-player maps 1745 # TODO: safety, remove and allow resettable per-player maps
1706 return 1e99 if $self->isa ("ext::map_per_player");#d#
1707 return 1e99 if $self->{deny_reset}; 1746 return 1e99 if $self->{deny_reset};
1708 1747
1709 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1748 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1710 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1749 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1711 1750
1722 my ($self) = @_; 1761 my ($self) = @_;
1723 1762
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1763 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 1764
1726 return if $self->players; 1765 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d#
1728 1766
1729 warn "resetting map ", $self->path;#d# 1767 warn "resetting map ", $self->path;
1730 1768
1731 $self->in_memory (cf::MAP_SWAPPED); 1769 $self->in_memory (cf::MAP_SWAPPED);
1732 1770
1733 # need to save uniques path 1771 # need to save uniques path
1734 unless ($self->{deny_save}) { 1772 unless ($self->{deny_save}) {
1766 $cf::MAP{$self->path} = $self; 1804 $cf::MAP{$self->path} = $self;
1767 1805
1768 $self->reset; # polite request, might not happen 1806 $self->reset; # polite request, might not happen
1769} 1807}
1770 1808
1809=item $maps = cf::map::tmp_maps
1810
1811Returns an arrayref with all map paths of currently instantiated and saved
1812maps. May block.
1813
1814=cut
1815
1816sub tmp_maps() {
1817 [
1818 map {
1819 utf8::decode $_;
1820 /\.map$/
1821 ? normalise $_
1822 : ()
1823 } @{ aio_readdir $TMPDIR or [] }
1824 ]
1825}
1826
1827=item $maps = cf::map::random_maps
1828
1829Returns an arrayref with all map paths of currently instantiated and saved
1830random maps. May block.
1831
1832=cut
1833
1834sub random_maps() {
1835 [
1836 map {
1837 utf8::decode $_;
1838 /\.map$/
1839 ? normalise "?random/$_"
1840 : ()
1841 } @{ aio_readdir $RANDOMDIR or [] }
1842 ]
1843}
1844
1771=item cf::map::unique_maps 1845=item cf::map::unique_maps
1772 1846
1773Returns an arrayref of paths of all shared maps that have 1847Returns an arrayref of paths of all shared maps that have
1774instantiated unique items. May block. 1848instantiated unique items. May block.
1775 1849
1776=cut 1850=cut
1777 1851
1778sub unique_maps() { 1852sub unique_maps() {
1779 my $files = aio_readdir $UNIQUEDIR 1853 [
1780 or return; 1854 map {
1781
1782 my @paths;
1783
1784 for (@$files) {
1785 utf8::decode $_; 1855 utf8::decode $_;
1786 next if /\.pst$/; 1856 /\.map$/
1787 next unless /^$PATH_SEP/o; 1857 ? normalise $_
1788 1858 : ()
1789 push @paths, cf::map::normalise $_; 1859 } @{ aio_readdir $UNIQUEDIR or [] }
1790 } 1860 ]
1791
1792 \@paths
1793} 1861}
1794 1862
1795package cf; 1863package cf;
1796 1864
1797=back 1865=back
2560sub reload_resources { 2628sub reload_resources {
2561 warn "reloading resource files...\n"; 2629 warn "reloading resource files...\n";
2562 2630
2563 reload_regions; 2631 reload_regions;
2564 reload_facedata; 2632 reload_facedata;
2633 #reload_archetypes;#d#
2565 reload_archetypes; 2634 reload_archetypes;
2566 reload_treasures; 2635 reload_treasures;
2567 2636
2568 warn "finished reloading resource files\n"; 2637 warn "finished reloading resource files\n";
2569} 2638}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines