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.262 by root, Sat Apr 28 05:55:55 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
374 my $runtime = "$LOCALDIR/runtime";
375 404
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
377 or return; 406 or return;
378 407
379 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
385 414
386 # always fsync - this file is important 415 # always fsync - this file is important
387 aio_fsync $fh 416 aio_fsync $fh
388 and return; 417 and return;
389 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
390 close $fh 422 close $fh
391 or return; 423 or return;
392 424
393 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
394 and return; 426 and return;
427
428 warn "runtime file written.\n";
395 429
396 1 430 1
397} 431}
398 432
399=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
592 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
593 627
594 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 632
599 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 634 my $pkg = shift @arg;
601 635
602 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
643 if (ref $_[0]) { 677 if (ref $_[0]) {
644 _object_attach @_; 678 _object_attach @_;
645 } else { 679 } else {
646 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
647 } 681 }
682 _recalc_want;
648}; 683};
649 684
650# all those should be optimised 685# all those should be optimised
651sub cf::attachable::detach { 686sub cf::attachable::detach {
652 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
655 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
656 reattach ($obj); 691 reattach ($obj);
657 } else { 692 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
659 } 694 }
695 _recalc_want;
660}; 696};
661 697
662sub cf::attachable::attached { 698sub cf::attachable::attached {
663 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
664 700
… …
837 or return; 873 or return;
838 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
839 } 875 }
840 876
841 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
843 return ($data, $av); 879 return ($data, $av);
844} 880}
845 881
846############################################################################# 882#############################################################################
847# command handling &c 883# command handling &c
… …
907 943
908 cf::override; 944 cf::override;
909 }, 945 },
910); 946);
911 947
912sub load_extension {
913 my ($path) = @_;
914
915 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
916 my $base = $1;
917 my $pkg = $1;
918 $pkg =~ s/[^[:word:]]/_/g;
919 $pkg = "ext::$pkg";
920
921 warn "... loading '$path' into '$pkg'\n";
922
923 open my $fh, "<:utf8", $path
924 or die "$path: $!";
925
926 my $source =
927 "package $pkg; use strict; use utf8;\n"
928 . "#line 1 \"$path\"\n{\n"
929 . (do { local $/; <$fh> })
930 . "\n};\n1";
931
932 unless (eval $source) {
933 my $msg = $@ ? "$path: $@\n"
934 : "extension disabled.\n";
935 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936 warn $@;
937 warn "mandatory extension failed to load, exiting.\n";
938 exit 1;
939 }
940 die $@;
941 }
942
943 push @EXTS, $pkg;
944}
945
946sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
947 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 953 next unless -r $path;
949 eval { 954
950 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};
951 1 1011 }
952 } or warn "$ext not loaded: $@"; 1012
1013 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress;
1016 }
953 } 1017 };
954} 1018}
955 1019
956############################################################################# 1020#############################################################################
957 1021
958=head2 CORE EXTENSIONS 1022=head2 CORE EXTENSIONS
… …
1269 my ($self, $merge) = @_; 1333 my ($self, $merge) = @_;
1270 1334
1271 # we have to keep some variables in memory intact 1335 # we have to keep some variables in memory intact
1272 local $self->{path}; 1336 local $self->{path};
1273 local $self->{load_path}; 1337 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1338
1277 $self->SUPER::thawer_merge ($merge); 1339 $self->SUPER::thawer_merge ($merge);
1278} 1340}
1279 1341
1280sub normalise { 1342sub normalise {
… …
1380 1442
1381 $_->change_map_light ($change) 1443 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1444 for grep $_->outdoor, values %cf::MAP;
1383} 1445}
1384 1446
1447sub decay_objects {
1448 my ($self) = @_;
1449
1450 return if $self->{deny_reset};
1451
1452 $self->do_decay_objects;
1453}
1454
1385sub unlink_save { 1455sub unlink_save {
1386 my ($self) = @_; 1456 my ($self) = @_;
1387 1457
1388 utf8::encode (my $save = $self->save_path); 1458 utf8::encode (my $save = $self->save_path);
1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1459 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1445 $self->load_header_orig 1515 $self->load_header_orig
1446 or return; 1516 or return;
1447 $self->prepare_orig; 1517 $self->prepare_orig;
1448 } 1518 }
1449 1519
1520 $self->{deny_reset} = 1
1521 if $self->no_reset;
1522
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1523 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1524 unless $self->default_region;
1452 1525
1453 1 1526 1
1454} 1527}
… …
1469 $map->{last_save} = $cf::RUNTIME; 1542 $map->{last_save} = $cf::RUNTIME;
1470 1543
1471 $map->load_header 1544 $map->load_header
1472 or return; 1545 or return;
1473 1546
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1548 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1549 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1550 $map->reset;
1478 undef $guard; 1551 undef $guard;
1479 return find $path; 1552 return find $path;
… …
1546 my ($self, $ob) = @_; 1619 my ($self, $ob) = @_;
1547 1620
1548 return find "~" . $ob->name . "/" . $self->{path} 1621 return find "~" . $ob->name . "/" . $self->{path}
1549 if $self->per_player; 1622 if $self->per_player;
1550 1623
1624# return find "?party/" . $ob->name . "/" . $self->{path}
1625# if $self->per_party;
1626
1551 $self 1627 $self
1552} 1628}
1553 1629
1554# 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
1555sub load_diag { 1631sub load_diag {
… …
1665 1741
1666sub reset_at { 1742sub reset_at {
1667 my ($self) = @_; 1743 my ($self) = @_;
1668 1744
1669 # TODO: safety, remove and allow resettable per-player maps 1745 # TODO: safety, remove and allow resettable per-player maps
1670 return 1e99 if $self->isa ("ext::map_per_player");#d#
1671 return 1e99 if $self->{deny_reset}; 1746 return 1e99 if $self->{deny_reset};
1672 1747
1673 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1748 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674 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;
1675 1750
… …
1686 my ($self) = @_; 1761 my ($self) = @_;
1687 1762
1688 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1763 my $lock = cf::lock_acquire "map_data:$self->{path}";
1689 1764
1690 return if $self->players; 1765 return if $self->players;
1691 return if $self->isa ("ext::map_per_player");#d#
1692 1766
1693 warn "resetting map ", $self->path;#d# 1767 warn "resetting map ", $self->path;
1694 1768
1695 $self->in_memory (cf::MAP_SWAPPED); 1769 $self->in_memory (cf::MAP_SWAPPED);
1696 1770
1697 # need to save uniques path 1771 # need to save uniques path
1698 unless ($self->{deny_save}) { 1772 unless ($self->{deny_save}) {
… …
1730 $cf::MAP{$self->path} = $self; 1804 $cf::MAP{$self->path} = $self;
1731 1805
1732 $self->reset; # polite request, might not happen 1806 $self->reset; # polite request, might not happen
1733} 1807}
1734 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
1735=item cf::map::unique_maps 1845=item cf::map::unique_maps
1736 1846
1737Returns an arrayref of paths of all shared maps that have 1847Returns an arrayref of paths of all shared maps that have
1738instantiated unique items. May block. 1848instantiated unique items. May block.
1739 1849
1740=cut 1850=cut
1741 1851
1742sub unique_maps() { 1852sub unique_maps() {
1743 my $files = aio_readdir $UNIQUEDIR 1853 [
1744 or return; 1854 map {
1745
1746 my @paths;
1747
1748 for (@$files) {
1749 utf8::decode $_; 1855 utf8::decode $_;
1750 next if /\.pst$/; 1856 /\.map$/
1751 next unless /^$PATH_SEP/o; 1857 ? normalise $_
1752 1858 : ()
1753 push @paths, cf::map::normalise $_; 1859 } @{ aio_readdir $UNIQUEDIR or [] }
1754 } 1860 ]
1755
1756 \@paths
1757} 1861}
1758 1862
1759package cf; 1863package cf;
1760 1864
1761=back 1865=back
… …
1867 $self->deactivate_recursive; 1971 $self->deactivate_recursive;
1868 1972
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1973 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 1974
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1975 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 1976 if $self->map && $self->map->{path} ne "{link}";
1873 1977
1874 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1978 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1875} 1979}
1876 1980
1877sub cf::object::player::leave_link { 1981sub cf::object::player::leave_link {
1878 my ($self, $map, $x, $y) = @_; 1982 my ($self, $map, $x, $y) = @_;
1983
1984 return unless $self->contr->active;
1879 1985
1880 my $link_pos = delete $self->{_link_pos}; 1986 my $link_pos = delete $self->{_link_pos};
1881 1987
1882 unless ($map) { 1988 unless ($map) {
1883 # restore original map position 1989 # restore original map position
… …
1906 2012
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908 $self->enter_map ($map, $x, $y); 2014 $self->enter_map ($map, $x, $y);
1909} 2015}
1910 2016
1911cf::player->attach (
1912 on_logout => sub {
1913 my ($pl) = @_;
1914
1915 # abort map switching before logout
1916 if ($pl->ob->{_link_pos}) {
1917 cf::sync_job {
1918 $pl->ob->leave_link
1919 };
1920 }
1921 },
1922 on_login => sub {
1923 my ($pl) = @_;
1924
1925 # try to abort aborted map switching on player login :)
1926 # should happen only on crashes
1927 if ($pl->ob->{_link_pos}) {
1928 $pl->ob->enter_link;
1929 (async {
1930 $pl->ob->reply (undef,
1931 "There was an internal problem at your last logout, "
1932 . "the server will try to bring you to your intended destination in a second.",
1933 cf::NDI_RED);
1934 # we need this sleep as the login has a concurrent enter_exit running
1935 # and this sleep increases chances of the player not ending up in scorn
1936 Coro::Timer::sleep 1;
1937 $pl->ob->leave_link;
1938 })->prio (2);
1939 }
1940 },
1941);
1942
1943=item $player_object->goto ($path, $x, $y) 2017=item $player_object->goto ($path, $x, $y[, $check->($map)])
1944 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
1945=cut 2024=cut
2025
2026our $GOTOGEN;
1946 2027
1947sub cf::object::player::goto { 2028sub cf::object::player::goto {
1948 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;
1949 2033
1950 $self->enter_link; 2034 $self->enter_link;
1951 2035
1952 (async { 2036 (async {
1953 my $map = eval { 2037 my $map = eval {
1954 my $map = cf::map::find $path; 2038 my $map = cf::map::find $path;
2039
2040 if ($map) {
1955 $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
1956 $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 $@;
1957 } or 2053 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 2054
2055 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation};
1960 $self->leave_link ($map, $x, $y); 2057 $self->leave_link ($map, $x, $y);
2058 }
1961 })->prio (1); 2059 })->prio (1);
1962} 2060}
1963 2061
1964=item $player_object->enter_exit ($exit_object) 2062=item $player_object->enter_exit ($exit_object)
1965 2063
… …
2450 warn $@ if $@; 2548 warn $@ if $@;
2451 _exit 0; 2549 _exit 0;
2452 } 2550 }
2453} 2551}
2454 2552
2455
2456
2457############################################################################# 2553#############################################################################
2458# the server's init and main functions 2554# the server's init and main functions
2459 2555
2460sub load_facedata($) { 2556sub load_facedata($) {
2461 my ($path) = @_; 2557 my ($path) = @_;
… …
2532sub reload_resources { 2628sub reload_resources {
2533 warn "reloading resource files...\n"; 2629 warn "reloading resource files...\n";
2534 2630
2535 reload_regions; 2631 reload_regions;
2536 reload_facedata; 2632 reload_facedata;
2633 #reload_archetypes;#d#
2537 reload_archetypes; 2634 reload_archetypes;
2538 reload_treasures; 2635 reload_treasures;
2539 2636
2540 warn "finished reloading resource files\n"; 2637 warn "finished reloading resource files\n";
2541} 2638}
… …
2811 my $signal = new Coro::Signal; 2908 my $signal = new Coro::Signal;
2812 push @WAIT_FOR_TICK_BEGIN, $signal; 2909 push @WAIT_FOR_TICK_BEGIN, $signal;
2813 $signal->wait; 2910 $signal->wait;
2814} 2911}
2815 2912
2913 my $min = 1e6;#d#
2914 my $avg = 10;
2816$TICK_WATCHER = Event->timer ( 2915$TICK_WATCHER = Event->timer (
2817 reentrant => 0, 2916 reentrant => 0,
2818 parked => 1, 2917 parked => 1,
2819 prio => 0, 2918 prio => 0,
2820 at => $NEXT_TICK || $TICK, 2919 at => $NEXT_TICK || $TICK,
… …
2824 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"
2825 unless ++$bug_warning > 10; 2924 unless ++$bug_warning > 10;
2826 return; 2925 return;
2827 } 2926 }
2828 2927
2829 $NOW = Event::time; 2928 $NOW = $tick_start = Event::time;
2830 2929
2831 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 };
2832 2954
2833 $RUNTIME += $TICK; 2955 $RUNTIME += $TICK;
2834 $NEXT_TICK += $TICK; 2956 $NEXT_TICK += $TICK;
2835 2957
2836 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2842 } 2964 }
2843 2965
2844# my $AFTER = Event::time; 2966# my $AFTER = Event::time;
2845# warn $AFTER - $NOW;#d# 2967# warn $AFTER - $NOW;#d#
2846 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
2847 # 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
2848 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2849 2980
2850 $TICK_WATCHER->at ($NEXT_TICK); 2981 $TICK_WATCHER->at ($NEXT_TICK);
2851 $TICK_WATCHER->start; 2982 $TICK_WATCHER->start;
2852 2983
2853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2984 $LOAD = ($NOW - $tick_start) / $TICK;
2854 $sig->send; 2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2855 }
2856 while (my $sig = shift @WAIT_FOR_TICK) {
2857 $sig->send;
2858 }
2859 2986
2860 _post_tick; 2987 _post_tick;
2988
2989
2861 }, 2990 },
2862); 2991);
2863 2992
2864{ 2993{
2865 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