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.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.279 by root, Mon Jun 11 22:16:53 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
… …
395 my $runtime = "$LOCALDIR/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
396 397
397 # first touch the runtime file to show we are still running: 398 # first touch the runtime file to show we are still running:
398 # the fsync below can take a very very long time. 399 # the fsync below can take a very very long time.
399 400
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 401 IO::AIO::aio_utime $runtime, undef, undef;
401 utime undef, undef, $fh;
402 }
403 402
404 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
405 404
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
407 or return; 406 or return;
… …
416 # always fsync - this file is important 415 # always fsync - this file is important
417 aio_fsync $fh 416 aio_fsync $fh
418 and return; 417 and return;
419 418
420 # touch it again to show we are up-to-date 419 # touch it again to show we are up-to-date
421 utime undef, undef, $fh; 420 aio_utime $fh, undef, undef;
422 421
423 close $fh 422 close $fh
424 or return; 423 or return;
425 424
426 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
427 and return; 426 and return;
428 427
429 warn "runtime file written.\n";#d# 428 warn "runtime file written.\n";
430 429
431 1 430 1
432} 431}
433 432
434=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
874 or return; 873 or return;
875 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
876 } 875 }
877 876
878 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
880 return ($data, $av); 879 return ($data, $av);
881} 880}
882 881
883############################################################################# 882#############################################################################
884# command handling &c 883# command handling &c
… …
944 943
945 cf::override; 944 cf::override;
946 }, 945 },
947); 946);
948 947
949sub load_extension {
950 my ($path) = @_;
951
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
953 my $base = $1;
954 my $pkg = $1;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 }
977 die $@;
978 }
979
980 push @EXTS, $pkg;
981}
982
983sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
984 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 953 next unless -r $path;
986 eval { 954
987 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)[0, 1] } split /\s+/, $1 }
973 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
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*/, $v->{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 : "$v->{base}: extension inactive.\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 warn $msg;
1007 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
1011 $progress = 1;
988 1 1012 }
989 } or warn "$ext not loaded: $@"; 1013
1014 skip:
1015 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1016 unless $progress;
1017 }
990 } 1018 };
991} 1019}
992 1020
993############################################################################# 1021#############################################################################
994 1022
995=head2 CORE EXTENSIONS 1023=head2 CORE EXTENSIONS
… …
1306 my ($self, $merge) = @_; 1334 my ($self, $merge) = @_;
1307 1335
1308 # we have to keep some variables in memory intact 1336 # we have to keep some variables in memory intact
1309 local $self->{path}; 1337 local $self->{path};
1310 local $self->{load_path}; 1338 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1339
1314 $self->SUPER::thawer_merge ($merge); 1340 $self->SUPER::thawer_merge ($merge);
1315} 1341}
1316 1342
1317sub normalise { 1343sub normalise {
… …
1417 1443
1418 $_->change_map_light ($change) 1444 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1445 for grep $_->outdoor, values %cf::MAP;
1420} 1446}
1421 1447
1448sub decay_objects {
1449 my ($self) = @_;
1450
1451 return if $self->{deny_reset};
1452
1453 $self->do_decay_objects;
1454}
1455
1422sub unlink_save { 1456sub unlink_save {
1423 my ($self) = @_; 1457 my ($self) = @_;
1424 1458
1425 utf8::encode (my $save = $self->save_path); 1459 utf8::encode (my $save = $self->save_path);
1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1460 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1482 $self->load_header_orig 1516 $self->load_header_orig
1483 or return; 1517 or return;
1484 $self->prepare_orig; 1518 $self->prepare_orig;
1485 } 1519 }
1486 1520
1521 $self->{deny_reset} = 1
1522 if $self->no_reset;
1523
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1524 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1525 unless $self->default_region;
1489 1526
1490 1 1527 1
1491} 1528}
… …
1506 $map->{last_save} = $cf::RUNTIME; 1543 $map->{last_save} = $cf::RUNTIME;
1507 1544
1508 $map->load_header 1545 $map->load_header
1509 or return; 1546 or return;
1510 1547
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1549 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1550 #$cf::WAIT_FOR_TICK->wait;
1514 $map->reset; 1551 $map->reset;
1515 undef $guard; 1552 undef $guard;
1516 return find $path; 1553 return find $path;
… …
1583 my ($self, $ob) = @_; 1620 my ($self, $ob) = @_;
1584 1621
1585 return find "~" . $ob->name . "/" . $self->{path} 1622 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 1623 if $self->per_player;
1587 1624
1625# return find "?party/" . $ob->name . "/" . $self->{path}
1626# if $self->per_party;
1627
1588 $self 1628 $self
1589} 1629}
1590 1630
1591# find and load all maps in the 3x3 area around a map 1631# find and load all maps in the 3x3 area around a map
1592sub load_diag { 1632sub load_diag {
… …
1702 1742
1703sub reset_at { 1743sub reset_at {
1704 my ($self) = @_; 1744 my ($self) = @_;
1705 1745
1706 # TODO: safety, remove and allow resettable per-player maps 1746 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 1747 return 1e99 if $self->{deny_reset};
1709 1748
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1749 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1750 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 1751
… …
1723 my ($self) = @_; 1762 my ($self) = @_;
1724 1763
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1764 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 1765
1727 return if $self->players; 1766 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 1767
1730 warn "resetting map ", $self->path;#d# 1768 warn "resetting map ", $self->path;
1731 1769
1732 $self->in_memory (cf::MAP_SWAPPED); 1770 $self->in_memory (cf::MAP_SWAPPED);
1733 1771
1734 # need to save uniques path 1772 # need to save uniques path
1735 unless ($self->{deny_save}) { 1773 unless ($self->{deny_save}) {
… …
1767 $cf::MAP{$self->path} = $self; 1805 $cf::MAP{$self->path} = $self;
1768 1806
1769 $self->reset; # polite request, might not happen 1807 $self->reset; # polite request, might not happen
1770} 1808}
1771 1809
1810=item $maps = cf::map::tmp_maps
1811
1812Returns an arrayref with all map paths of currently instantiated and saved
1813maps. May block.
1814
1815=cut
1816
1817sub tmp_maps() {
1818 [
1819 map {
1820 utf8::decode $_;
1821 /\.map$/
1822 ? normalise $_
1823 : ()
1824 } @{ aio_readdir $TMPDIR or [] }
1825 ]
1826}
1827
1828=item $maps = cf::map::random_maps
1829
1830Returns an arrayref with all map paths of currently instantiated and saved
1831random maps. May block.
1832
1833=cut
1834
1835sub random_maps() {
1836 [
1837 map {
1838 utf8::decode $_;
1839 /\.map$/
1840 ? normalise "?random/$_"
1841 : ()
1842 } @{ aio_readdir $RANDOMDIR or [] }
1843 ]
1844}
1845
1772=item cf::map::unique_maps 1846=item cf::map::unique_maps
1773 1847
1774Returns an arrayref of paths of all shared maps that have 1848Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 1849instantiated unique items. May block.
1776 1850
1777=cut 1851=cut
1778 1852
1779sub unique_maps() { 1853sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 1854 [
1781 or return; 1855 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 1856 utf8::decode $_;
1787 next if /\.pst$/; 1857 /\.map$/
1788 next unless /^$PATH_SEP/o; 1858 ? normalise $_
1789 1859 : ()
1790 push @paths, cf::map::normalise $_; 1860 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 1861 ]
1792
1793 \@paths
1794} 1862}
1795 1863
1796package cf; 1864package cf;
1797 1865
1798=back 1866=back
… …
1904 $self->deactivate_recursive; 1972 $self->deactivate_recursive;
1905 1973
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1974 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 1975
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1976 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 1977 if $self->map && $self->map->{path} ne "{link}";
1910 1978
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1979 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 1980}
1913 1981
1914sub cf::object::player::leave_link { 1982sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 1983 my ($self, $map, $x, $y) = @_;
1984
1985 return unless $self->contr->active;
1916 1986
1917 my $link_pos = delete $self->{_link_pos}; 1987 my $link_pos = delete $self->{_link_pos};
1918 1988
1919 unless ($map) { 1989 unless ($map) {
1920 # restore original map position 1990 # restore original map position
… …
1943 2013
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2015 $self->enter_map ($map, $x, $y);
1946} 2016}
1947 2017
1948cf::player->attach (
1949 on_logout => sub {
1950 my ($pl) = @_;
1951
1952 # abort map switching before logout
1953 if ($pl->ob->{_link_pos}) {
1954 cf::sync_job {
1955 $pl->ob->leave_link
1956 };
1957 }
1958 },
1959 on_login => sub {
1960 my ($pl) = @_;
1961
1962 # try to abort aborted map switching on player login :)
1963 # should happen only on crashes
1964 if ($pl->ob->{_link_pos}) {
1965 $pl->ob->enter_link;
1966 (async {
1967 $pl->ob->reply (undef,
1968 "There was an internal problem at your last logout, "
1969 . "the server will try to bring you to your intended destination in a second.",
1970 cf::NDI_RED);
1971 # we need this sleep as the login has a concurrent enter_exit running
1972 # and this sleep increases chances of the player not ending up in scorn
1973 Coro::Timer::sleep 1;
1974 $pl->ob->leave_link;
1975 })->prio (2);
1976 }
1977 },
1978);
1979
1980=item $player_object->goto ($path, $x, $y) 2018=item $player_object->goto ($path, $x, $y[, $check->($map)])
1981 2019
2020Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position.
2024
1982=cut 2025=cut
2026
2027our $GOTOGEN;
1983 2028
1984sub cf::object::player::goto { 2029sub cf::object::player::goto {
1985 my ($self, $path, $x, $y) = @_; 2030 my ($self, $path, $x, $y, $check) = @_;
2031
2032 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1986 2034
1987 $self->enter_link; 2035 $self->enter_link;
1988 2036
1989 (async { 2037 (async {
1990 my $map = eval { 2038 my $map = eval {
1991 my $map = cf::map::find $path; 2039 my $map = cf::map::find $path;
2040
2041 if ($map) {
1992 $map = $map->customise_for ($self) if $map; 2042 $map = $map->customise_for ($self);
2043 $map = $check->($map) if $check && $map;
2044 } else {
2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2046 }
2047
1993 $map 2048 $map
2049 };
2050
2051 if ($@) {
2052 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2053 LOG llevError | logBacktrace, Carp::longmess $@;
1994 } or 2054 }
1995 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1996 2055
2056 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation};
1997 $self->leave_link ($map, $x, $y); 2058 $self->leave_link ($map, $x, $y);
2059 }
1998 })->prio (1); 2060 })->prio (1);
1999} 2061}
2000 2062
2001=item $player_object->enter_exit ($exit_object) 2063=item $player_object->enter_exit ($exit_object)
2002 2064
… …
2487 warn $@ if $@; 2549 warn $@ if $@;
2488 _exit 0; 2550 _exit 0;
2489 } 2551 }
2490} 2552}
2491 2553
2492
2493
2494############################################################################# 2554#############################################################################
2495# the server's init and main functions 2555# the server's init and main functions
2496 2556
2497sub load_facedata($) { 2557sub load_facedata($) {
2498 my ($path) = @_; 2558 my ($path) = @_;
… …
2569sub reload_resources { 2629sub reload_resources {
2570 warn "reloading resource files...\n"; 2630 warn "reloading resource files...\n";
2571 2631
2572 reload_regions; 2632 reload_regions;
2573 reload_facedata; 2633 reload_facedata;
2634 #reload_archetypes;#d#
2574 reload_archetypes; 2635 reload_archetypes;
2575 reload_treasures; 2636 reload_treasures;
2576 2637
2577 warn "finished reloading resource files\n"; 2638 warn "finished reloading resource files\n";
2578} 2639}
… …
2848 my $signal = new Coro::Signal; 2909 my $signal = new Coro::Signal;
2849 push @WAIT_FOR_TICK_BEGIN, $signal; 2910 push @WAIT_FOR_TICK_BEGIN, $signal;
2850 $signal->wait; 2911 $signal->wait;
2851} 2912}
2852 2913
2914 my $min = 1e6;#d#
2915 my $avg = 10;
2853$TICK_WATCHER = Event->timer ( 2916$TICK_WATCHER = Event->timer (
2854 reentrant => 0, 2917 reentrant => 0,
2855 parked => 1, 2918 parked => 1,
2856 prio => 0, 2919 prio => 0,
2857 at => $NEXT_TICK || $TICK, 2920 at => $NEXT_TICK || $TICK,
… …
2864 } 2927 }
2865 2928
2866 $NOW = $tick_start = Event::time; 2929 $NOW = $tick_start = Event::time;
2867 2930
2868 cf::server_tick; # one server iteration 2931 cf::server_tick; # one server iteration
2932
2933 0 && sync_job {#d#
2934 for(1..10) {
2935 my $t = Event::time;
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2937 or die;
2938
2939 $map->width (50);
2940 $map->height (50);
2941 $map->alloc;
2942 $map->_load_objects ("/tmp/x.map", 1);
2943 my $t = Event::time - $t;
2944
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 };
2869 2955
2870 $RUNTIME += $TICK; 2956 $RUNTIME += $TICK;
2871 $NEXT_TICK += $TICK; 2957 $NEXT_TICK += $TICK;
2872 2958
2873 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {

Diff Legend

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