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.272 by root, Sun Jun 3 15:32:50 2007 UTC vs.
Revision 1.278 by root, Mon Jun 11 21:38:14 2007 UTC

… …
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 194
194# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 196# within the Safe compartment.
196for my $pkg (qw( 197for my $pkg (qw(
197 cf::global cf::attachable 198 cf::global cf::attachable
… …
422 or return; 423 or return;
423 424
424 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
425 and return; 426 and return;
426 427
427 warn "runtime file written.\n";#d# 428 warn "runtime file written.\n";
428 429
429 1 430 1
430} 431}
431 432
432=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
872 or return; 873 or return;
873 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
874 } 875 }
875 876
876 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
877 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
878 return ($data, $av); 879 return ($data, $av);
879} 880}
880 881
881############################################################################# 882#############################################################################
882# command handling &c 883# command handling &c
… …
942 943
943 cf::override; 944 cf::override;
944 }, 945 },
945); 946);
946 947
947sub load_extension {
948 my ($path) = @_;
949
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1;
952 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg";
955
956 warn "... loading '$path' into '$pkg'\n";
957
958 open my $fh, "<:utf8", $path
959 or die "$path: $!";
960
961 my $source =
962 "package $pkg; use strict; use utf8;\n"
963 . "#line 1 \"$path\"\n{\n"
964 . (do { local $/; <$fh> })
965 . "\n};\n1";
966
967 unless (eval $source) {
968 my $msg = $@ ? "$path: $@\n"
969 : "extension disabled.\n";
970 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
971 warn $@;
972 warn "mandatory extension failed to load, exiting.\n";
973 exit 1;
974 }
975 die $@;
976 }
977
978 push @EXTS, $pkg;
979}
980
981sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
982 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
983 next unless -r $ext; 953 next unless -r $path;
984 eval { 954
985 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};
986 1 1011 }
987 } or warn "$ext not loaded: $@"; 1012
1013 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress;
1016 }
988 } 1017 };
989} 1018}
990 1019
991############################################################################# 1020#############################################################################
992 1021
993=head2 CORE EXTENSIONS 1022=head2 CORE EXTENSIONS
… …
1304 my ($self, $merge) = @_; 1333 my ($self, $merge) = @_;
1305 1334
1306 # we have to keep some variables in memory intact 1335 # we have to keep some variables in memory intact
1307 local $self->{path}; 1336 local $self->{path};
1308 local $self->{load_path}; 1337 local $self->{load_path};
1309 local $self->{deny_save};
1310 local $self->{deny_reset};
1311 1338
1312 $self->SUPER::thawer_merge ($merge); 1339 $self->SUPER::thawer_merge ($merge);
1313} 1340}
1314 1341
1315sub normalise { 1342sub normalise {
… …
1415 1442
1416 $_->change_map_light ($change) 1443 $_->change_map_light ($change)
1417 for grep $_->outdoor, values %cf::MAP; 1444 for grep $_->outdoor, values %cf::MAP;
1418} 1445}
1419 1446
1447sub decay_objects {
1448 my ($self) = @_;
1449
1450 return if $self->{deny_reset};
1451
1452 $self->do_decay_objects;
1453}
1454
1420sub unlink_save { 1455sub unlink_save {
1421 my ($self) = @_; 1456 my ($self) = @_;
1422 1457
1423 utf8::encode (my $save = $self->save_path); 1458 utf8::encode (my $save = $self->save_path);
1424 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1459 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1480 $self->load_header_orig 1515 $self->load_header_orig
1481 or return; 1516 or return;
1482 $self->prepare_orig; 1517 $self->prepare_orig;
1483 } 1518 }
1484 1519
1520 $self->{deny_reset} = 1
1521 if $self->no_reset;
1522
1485 $self->default_region (cf::region::find_by_path $self->{path}) 1523 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region; 1524 unless $self->default_region;
1487 1525
1488 1 1526 1
1489} 1527}
… …
1504 $map->{last_save} = $cf::RUNTIME; 1542 $map->{last_save} = $cf::RUNTIME;
1505 1543
1506 $map->load_header 1544 $map->load_header
1507 or return; 1545 or return;
1508 1546
1509 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1510 # doing this can freeze the server in a sync job, obviously 1548 # doing this can freeze the server in a sync job, obviously
1511 #$cf::WAIT_FOR_TICK->wait; 1549 #$cf::WAIT_FOR_TICK->wait;
1512 $map->reset; 1550 $map->reset;
1513 undef $guard; 1551 undef $guard;
1514 return find $path; 1552 return find $path;
… …
1581 my ($self, $ob) = @_; 1619 my ($self, $ob) = @_;
1582 1620
1583 return find "~" . $ob->name . "/" . $self->{path} 1621 return find "~" . $ob->name . "/" . $self->{path}
1584 if $self->per_player; 1622 if $self->per_player;
1585 1623
1624# return find "?party/" . $ob->name . "/" . $self->{path}
1625# if $self->per_party;
1626
1586 $self 1627 $self
1587} 1628}
1588 1629
1589# 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
1590sub load_diag { 1631sub load_diag {
… …
1700 1741
1701sub reset_at { 1742sub reset_at {
1702 my ($self) = @_; 1743 my ($self) = @_;
1703 1744
1704 # TODO: safety, remove and allow resettable per-player maps 1745 # TODO: safety, remove and allow resettable per-player maps
1705 return 1e99 if $self->isa ("ext::map_per_player");#d#
1706 return 1e99 if $self->{deny_reset}; 1746 return 1e99 if $self->{deny_reset};
1707 1747
1708 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1748 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1709 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;
1710 1750
… …
1721 my ($self) = @_; 1761 my ($self) = @_;
1722 1762
1723 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1763 my $lock = cf::lock_acquire "map_data:$self->{path}";
1724 1764
1725 return if $self->players; 1765 return if $self->players;
1726 return if $self->isa ("ext::map_per_player");#d#
1727 1766
1728 warn "resetting map ", $self->path;#d# 1767 warn "resetting map ", $self->path;
1729 1768
1730 $self->in_memory (cf::MAP_SWAPPED); 1769 $self->in_memory (cf::MAP_SWAPPED);
1731 1770
1732 # need to save uniques path 1771 # need to save uniques path
1733 unless ($self->{deny_save}) { 1772 unless ($self->{deny_save}) {
… …
1765 $cf::MAP{$self->path} = $self; 1804 $cf::MAP{$self->path} = $self;
1766 1805
1767 $self->reset; # polite request, might not happen 1806 $self->reset; # polite request, might not happen
1768} 1807}
1769 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
1770=item cf::map::unique_maps 1845=item cf::map::unique_maps
1771 1846
1772Returns an arrayref of paths of all shared maps that have 1847Returns an arrayref of paths of all shared maps that have
1773instantiated unique items. May block. 1848instantiated unique items. May block.
1774 1849
1775=cut 1850=cut
1776 1851
1777sub unique_maps() { 1852sub unique_maps() {
1778 my $files = aio_readdir $UNIQUEDIR 1853 [
1779 or return; 1854 map {
1780
1781 my @paths;
1782
1783 for (@$files) {
1784 utf8::decode $_; 1855 utf8::decode $_;
1785 next if /\.pst$/; 1856 /\.map$/
1786 next unless /^$PATH_SEP/o; 1857 ? normalise $_
1787 1858 : ()
1788 push @paths, cf::map::normalise $_; 1859 } @{ aio_readdir $UNIQUEDIR or [] }
1789 } 1860 ]
1790
1791 \@paths
1792} 1861}
1793 1862
1794package cf; 1863package cf;
1795 1864
1796=back 1865=back
… …
2501 { 2570 {
2502 my $faces = $facedata->{faceinfo}; 2571 my $faces = $facedata->{faceinfo};
2503 2572
2504 while (my ($face, $info) = each %$faces) { 2573 while (my ($face, $info) = each %$faces) {
2505 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2574 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2506 warn "$face $info->{magicmap}\n" if $face =~ /obol/;#d#
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2510 Coro::cede; 2578 Coro::cede;
2511 } 2579 }
… …
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