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.263 by root, Sat May 5 05:40:27 2007 UTC vs.
Revision 1.278 by root, Mon Jun 11 21:38:14 2007 UTC

… …
90our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
91 91
92# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
95binmode STDOUT; 99binmode STDOUT;
96binmode STDERR; 100binmode STDERR;
97 101
98# read virtual server time, if available 102# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
… …
139 143
140=item $cf::TICK 144=item $cf::TICK
141 145
142The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
143 147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
157
144=item %cf::CFG 158=item %cf::CFG
145 159
146Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 161from wherever your confdir points to.
148 162
… …
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@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';
178@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)
179 194
180# 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
181# within the Safe compartment. 196# within the Safe compartment.
182for my $pkg (qw( 197for my $pkg (qw(
183 cf::global cf::attachable 198 cf::global cf::attachable
… …
318 333
319sub sync_job(&) { 334sub sync_job(&) {
320 my ($job) = @_; 335 my ($job) = @_;
321 336
322 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
323 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
325 342
326 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
338 355
339 while ($busy) { 356 while ($busy) {
340 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
341 } 358 }
342 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
343 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
344 } else { 368 } else {
345 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
346 370
347 $job->() 371 $job->()
… …
367 391
368 $coro 392 $coro
369} 393}
370 394
371sub write_runtime { 395sub write_runtime {
396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
372 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
373 404
374 my $runtime = "$LOCALDIR/runtime";
375
376 warn "starting to write runtime...\n";#d#
377 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
378 or return; 406 or return;
379 407
380 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
381 # 10 is the runtime save interval, for a monotonic clock 409 # 10 is the runtime save interval, for a monotonic clock
… …
386 414
387 # always fsync - this file is important 415 # always fsync - this file is important
388 aio_fsync $fh 416 aio_fsync $fh
389 and return; 417 and return;
390 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
391 close $fh 422 close $fh
392 or return; 423 or return;
393 424
394 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
395 and return; 426 and return;
396 427
397 warn "... done writing runtime.\n";#d# 428 warn "runtime file written.\n";
398 429
399 1 430 1
400} 431}
401 432
402=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
595 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
596 627
597 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
598 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
599 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
600 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
601 632
602 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
603 my $pkg = shift @arg; 634 my $pkg = shift @arg;
604 635
605 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
646 if (ref $_[0]) { 677 if (ref $_[0]) {
647 _object_attach @_; 678 _object_attach @_;
648 } else { 679 } else {
649 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
650 } 681 }
682 _recalc_want;
651}; 683};
652 684
653# all those should be optimised 685# all those should be optimised
654sub cf::attachable::detach { 686sub cf::attachable::detach {
655 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
658 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
659 reattach ($obj); 691 reattach ($obj);
660 } else { 692 } else {
661 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
662 } 694 }
695 _recalc_want;
663}; 696};
664 697
665sub cf::attachable::attached { 698sub cf::attachable::attached {
666 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
667 700
… …
840 or return; 873 or return;
841 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
842 } 875 }
843 876
844 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
845 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
846 return ($data, $av); 879 return ($data, $av);
847} 880}
848 881
849############################################################################# 882#############################################################################
850# command handling &c 883# command handling &c
… …
910 943
911 cf::override; 944 cf::override;
912 }, 945 },
913); 946);
914 947
915sub load_extension {
916 my ($path) = @_;
917
918 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
919 my $base = $1;
920 my $pkg = $1;
921 $pkg =~ s/[^[:word:]]/_/g;
922 $pkg = "ext::$pkg";
923
924 warn "... loading '$path' into '$pkg'\n";
925
926 open my $fh, "<:utf8", $path
927 or die "$path: $!";
928
929 my $source =
930 "package $pkg; use strict; use utf8;\n"
931 . "#line 1 \"$path\"\n{\n"
932 . (do { local $/; <$fh> })
933 . "\n};\n1";
934
935 unless (eval $source) {
936 my $msg = $@ ? "$path: $@\n"
937 : "extension disabled.\n";
938 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
939 warn $@;
940 warn "mandatory extension failed to load, exiting.\n";
941 exit 1;
942 }
943 die $@;
944 }
945
946 push @EXTS, $pkg;
947}
948
949sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
950 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
951 next unless -r $ext; 953 next unless -r $path;
952 eval { 954
953 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};
954 1 1011 }
955 } or warn "$ext not loaded: $@"; 1012
1013 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress;
1016 }
956 } 1017 };
957} 1018}
958 1019
959############################################################################# 1020#############################################################################
960 1021
961=head2 CORE EXTENSIONS 1022=head2 CORE EXTENSIONS
… …
1272 my ($self, $merge) = @_; 1333 my ($self, $merge) = @_;
1273 1334
1274 # we have to keep some variables in memory intact 1335 # we have to keep some variables in memory intact
1275 local $self->{path}; 1336 local $self->{path};
1276 local $self->{load_path}; 1337 local $self->{load_path};
1277 local $self->{deny_save};
1278 local $self->{deny_reset};
1279 1338
1280 $self->SUPER::thawer_merge ($merge); 1339 $self->SUPER::thawer_merge ($merge);
1281} 1340}
1282 1341
1283sub normalise { 1342sub normalise {
… …
1383 1442
1384 $_->change_map_light ($change) 1443 $_->change_map_light ($change)
1385 for grep $_->outdoor, values %cf::MAP; 1444 for grep $_->outdoor, values %cf::MAP;
1386} 1445}
1387 1446
1447sub decay_objects {
1448 my ($self) = @_;
1449
1450 return if $self->{deny_reset};
1451
1452 $self->do_decay_objects;
1453}
1454
1388sub unlink_save { 1455sub unlink_save {
1389 my ($self) = @_; 1456 my ($self) = @_;
1390 1457
1391 utf8::encode (my $save = $self->save_path); 1458 utf8::encode (my $save = $self->save_path);
1392 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1459 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1448 $self->load_header_orig 1515 $self->load_header_orig
1449 or return; 1516 or return;
1450 $self->prepare_orig; 1517 $self->prepare_orig;
1451 } 1518 }
1452 1519
1520 $self->{deny_reset} = 1
1521 if $self->no_reset;
1522
1453 $self->default_region (cf::region::find_by_path $self->{path}) 1523 $self->default_region (cf::region::find_by_path $self->{path})
1454 unless $self->default_region; 1524 unless $self->default_region;
1455 1525
1456 1 1526 1
1457} 1527}
… …
1472 $map->{last_save} = $cf::RUNTIME; 1542 $map->{last_save} = $cf::RUNTIME;
1473 1543
1474 $map->load_header 1544 $map->load_header
1475 or return; 1545 or return;
1476 1546
1477 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1478 # doing this can freeze the server in a sync job, obviously 1548 # doing this can freeze the server in a sync job, obviously
1479 #$cf::WAIT_FOR_TICK->wait; 1549 #$cf::WAIT_FOR_TICK->wait;
1480 $map->reset; 1550 $map->reset;
1481 undef $guard; 1551 undef $guard;
1482 return find $path; 1552 return find $path;
… …
1549 my ($self, $ob) = @_; 1619 my ($self, $ob) = @_;
1550 1620
1551 return find "~" . $ob->name . "/" . $self->{path} 1621 return find "~" . $ob->name . "/" . $self->{path}
1552 if $self->per_player; 1622 if $self->per_player;
1553 1623
1624# return find "?party/" . $ob->name . "/" . $self->{path}
1625# if $self->per_party;
1626
1554 $self 1627 $self
1555} 1628}
1556 1629
1557# 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
1558sub load_diag { 1631sub load_diag {
… …
1668 1741
1669sub reset_at { 1742sub reset_at {
1670 my ($self) = @_; 1743 my ($self) = @_;
1671 1744
1672 # TODO: safety, remove and allow resettable per-player maps 1745 # TODO: safety, remove and allow resettable per-player maps
1673 return 1e99 if $self->isa ("ext::map_per_player");#d#
1674 return 1e99 if $self->{deny_reset}; 1746 return 1e99 if $self->{deny_reset};
1675 1747
1676 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1748 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1677 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;
1678 1750
… …
1689 my ($self) = @_; 1761 my ($self) = @_;
1690 1762
1691 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1763 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 1764
1693 return if $self->players; 1765 return if $self->players;
1694 return if $self->isa ("ext::map_per_player");#d#
1695 1766
1696 warn "resetting map ", $self->path;#d# 1767 warn "resetting map ", $self->path;
1697 1768
1698 $self->in_memory (cf::MAP_SWAPPED); 1769 $self->in_memory (cf::MAP_SWAPPED);
1699 1770
1700 # need to save uniques path 1771 # need to save uniques path
1701 unless ($self->{deny_save}) { 1772 unless ($self->{deny_save}) {
… …
1733 $cf::MAP{$self->path} = $self; 1804 $cf::MAP{$self->path} = $self;
1734 1805
1735 $self->reset; # polite request, might not happen 1806 $self->reset; # polite request, might not happen
1736} 1807}
1737 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
1738=item cf::map::unique_maps 1845=item cf::map::unique_maps
1739 1846
1740Returns an arrayref of paths of all shared maps that have 1847Returns an arrayref of paths of all shared maps that have
1741instantiated unique items. May block. 1848instantiated unique items. May block.
1742 1849
1743=cut 1850=cut
1744 1851
1745sub unique_maps() { 1852sub unique_maps() {
1746 my $files = aio_readdir $UNIQUEDIR 1853 [
1747 or return; 1854 map {
1748
1749 my @paths;
1750
1751 for (@$files) {
1752 utf8::decode $_; 1855 utf8::decode $_;
1753 next if /\.pst$/; 1856 /\.map$/
1754 next unless /^$PATH_SEP/o; 1857 ? normalise $_
1755 1858 : ()
1756 push @paths, cf::map::normalise $_; 1859 } @{ aio_readdir $UNIQUEDIR or [] }
1757 } 1860 ]
1758
1759 \@paths
1760} 1861}
1761 1862
1762package cf; 1863package cf;
1763 1864
1764=back 1865=back
… …
1870 $self->deactivate_recursive; 1971 $self->deactivate_recursive;
1871 1972
1872 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1973 return if UNIVERSAL::isa $self->map, "ext::map_link";
1873 1974
1874 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1975 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1875 if $self->map; 1976 if $self->map && $self->map->{path} ne "{link}";
1876 1977
1877 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1978 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1878} 1979}
1879 1980
1880sub cf::object::player::leave_link { 1981sub cf::object::player::leave_link {
1881 my ($self, $map, $x, $y) = @_; 1982 my ($self, $map, $x, $y) = @_;
1983
1984 return unless $self->contr->active;
1882 1985
1883 my $link_pos = delete $self->{_link_pos}; 1986 my $link_pos = delete $self->{_link_pos};
1884 1987
1885 unless ($map) { 1988 unless ($map) {
1886 # restore original map position 1989 # restore original map position
… …
1909 2012
1910 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1911 $self->enter_map ($map, $x, $y); 2014 $self->enter_map ($map, $x, $y);
1912} 2015}
1913 2016
1914cf::player->attach (
1915 on_logout => sub {
1916 my ($pl) = @_;
1917
1918 # abort map switching before logout
1919 if ($pl->ob->{_link_pos}) {
1920 cf::sync_job {
1921 $pl->ob->leave_link
1922 };
1923 }
1924 },
1925 on_login => sub {
1926 my ($pl) = @_;
1927
1928 # try to abort aborted map switching on player login :)
1929 # should happen only on crashes
1930 if ($pl->ob->{_link_pos}) {
1931 $pl->ob->enter_link;
1932 (async {
1933 $pl->ob->reply (undef,
1934 "There was an internal problem at your last logout, "
1935 . "the server will try to bring you to your intended destination in a second.",
1936 cf::NDI_RED);
1937 # we need this sleep as the login has a concurrent enter_exit running
1938 # and this sleep increases chances of the player not ending up in scorn
1939 Coro::Timer::sleep 1;
1940 $pl->ob->leave_link;
1941 })->prio (2);
1942 }
1943 },
1944);
1945
1946=item $player_object->goto ($path, $x, $y) 2017=item $player_object->goto ($path, $x, $y[, $check->($map)])
1947 2018
2019Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position.
2023
1948=cut 2024=cut
2025
2026our $GOTOGEN;
1949 2027
1950sub cf::object::player::goto { 2028sub cf::object::player::goto {
1951 my ($self, $path, $x, $y) = @_; 2029 my ($self, $path, $x, $y, $check) = @_;
2030
2031 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1952 2033
1953 $self->enter_link; 2034 $self->enter_link;
1954 2035
1955 (async { 2036 (async {
1956 my $map = eval { 2037 my $map = eval {
1957 my $map = cf::map::find $path; 2038 my $map = cf::map::find $path;
2039
2040 if ($map) {
1958 $map = $map->customise_for ($self) if $map; 2041 $map = $map->customise_for ($self);
2042 $map = $check->($map) if $check && $map;
2043 } else {
2044 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2045 }
2046
1959 $map 2047 $map
2048 };
2049
2050 if ($@) {
2051 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2052 LOG llevError | logBacktrace, Carp::longmess $@;
1960 } or 2053 }
1961 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1962 2054
2055 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation};
1963 $self->leave_link ($map, $x, $y); 2057 $self->leave_link ($map, $x, $y);
2058 }
1964 })->prio (1); 2059 })->prio (1);
1965} 2060}
1966 2061
1967=item $player_object->enter_exit ($exit_object) 2062=item $player_object->enter_exit ($exit_object)
1968 2063
… …
2453 warn $@ if $@; 2548 warn $@ if $@;
2454 _exit 0; 2549 _exit 0;
2455 } 2550 }
2456} 2551}
2457 2552
2458
2459
2460############################################################################# 2553#############################################################################
2461# the server's init and main functions 2554# the server's init and main functions
2462 2555
2463sub load_facedata($) { 2556sub load_facedata($) {
2464 my ($path) = @_; 2557 my ($path) = @_;
… …
2535sub reload_resources { 2628sub reload_resources {
2536 warn "reloading resource files...\n"; 2629 warn "reloading resource files...\n";
2537 2630
2538 reload_regions; 2631 reload_regions;
2539 reload_facedata; 2632 reload_facedata;
2633 #reload_archetypes;#d#
2540 reload_archetypes; 2634 reload_archetypes;
2541 reload_treasures; 2635 reload_treasures;
2542 2636
2543 warn "finished reloading resource files\n"; 2637 warn "finished reloading resource files\n";
2544} 2638}
… …
2814 my $signal = new Coro::Signal; 2908 my $signal = new Coro::Signal;
2815 push @WAIT_FOR_TICK_BEGIN, $signal; 2909 push @WAIT_FOR_TICK_BEGIN, $signal;
2816 $signal->wait; 2910 $signal->wait;
2817} 2911}
2818 2912
2913 my $min = 1e6;#d#
2914 my $avg = 10;
2819$TICK_WATCHER = Event->timer ( 2915$TICK_WATCHER = Event->timer (
2820 reentrant => 0, 2916 reentrant => 0,
2821 parked => 1, 2917 parked => 1,
2822 prio => 0, 2918 prio => 0,
2823 at => $NEXT_TICK || $TICK, 2919 at => $NEXT_TICK || $TICK,
… …
2827 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2923 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2828 unless ++$bug_warning > 10; 2924 unless ++$bug_warning > 10;
2829 return; 2925 return;
2830 } 2926 }
2831 2927
2832 $NOW = Event::time; 2928 $NOW = $tick_start = Event::time;
2833 2929
2834 cf::server_tick; # one server iteration 2930 cf::server_tick; # one server iteration
2931
2932 0 && sync_job {#d#
2933 for(1..10) {
2934 my $t = Event::time;
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2936 or die;
2937
2938 $map->width (50);
2939 $map->height (50);
2940 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1);
2942 my $t = Event::time - $t;
2943
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 };
2835 2954
2836 $RUNTIME += $TICK; 2955 $RUNTIME += $TICK;
2837 $NEXT_TICK += $TICK; 2956 $NEXT_TICK += $TICK;
2838 2957
2839 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2845 } 2964 }
2846 2965
2847# my $AFTER = Event::time; 2966# my $AFTER = Event::time;
2848# warn $AFTER - $NOW;#d# 2967# warn $AFTER - $NOW;#d#
2849 2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send;
2971 }
2972 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send;
2974 }
2975
2976 $NOW = Event::time;
2977
2850 # if we are delayed by four ticks or more, skip them all 2978 # if we are delayed by four ticks or more, skip them all
2851 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2852 2980
2853 $TICK_WATCHER->at ($NEXT_TICK); 2981 $TICK_WATCHER->at ($NEXT_TICK);
2854 $TICK_WATCHER->start; 2982 $TICK_WATCHER->start;
2855 2983
2856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2984 $LOAD = ($NOW - $tick_start) / $TICK;
2857 $sig->send; 2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2858 }
2859 while (my $sig = shift @WAIT_FOR_TICK) {
2860 $sig->send;
2861 }
2862 2986
2863 _post_tick; 2987 _post_tick;
2988
2989
2864 }, 2990 },
2865); 2991);
2866 2992
2867{ 2993{
2868 BDB::max_poll_time $TICK * 0.1; 2994 BDB::max_poll_time $TICK * 0.1;

Diff Legend

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