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.280 by root, Sat Jun 16 14:35:41 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) {
… …
634 _attach $registry, $klass, @attach; 665 _attach $registry, $klass, @attach;
635 } 666 }
636 667
637 $obj->{$name} = \%arg; 668 $obj->{$name} = \%arg;
638 } else { 669 } else {
639 warn "object uses attachment '$name' that is not available, postponing.\n"; 670 warn "object uses attachment '$name' which is not available, postponing.\n";
640 } 671 }
641 672
642 $obj->{_attachment}{$name} = undef; 673 $obj->{_attachment}{$name} = undef;
643} 674}
644 675
… …
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)[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;
954 1 1012 }
955 } or warn "$ext not loaded: $@"; 1013
1014 skip:
1015 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1016 unless $progress;
1017 }
956 } 1018 };
957} 1019}
958 1020
959############################################################################# 1021#############################################################################
960 1022
961=head2 CORE EXTENSIONS 1023=head2 CORE EXTENSIONS
… …
1272 my ($self, $merge) = @_; 1334 my ($self, $merge) = @_;
1273 1335
1274 # we have to keep some variables in memory intact 1336 # we have to keep some variables in memory intact
1275 local $self->{path}; 1337 local $self->{path};
1276 local $self->{load_path}; 1338 local $self->{load_path};
1277 local $self->{deny_save};
1278 local $self->{deny_reset};
1279 1339
1280 $self->SUPER::thawer_merge ($merge); 1340 $self->SUPER::thawer_merge ($merge);
1281} 1341}
1282 1342
1283sub normalise { 1343sub normalise {
… …
1383 1443
1384 $_->change_map_light ($change) 1444 $_->change_map_light ($change)
1385 for grep $_->outdoor, values %cf::MAP; 1445 for grep $_->outdoor, values %cf::MAP;
1386} 1446}
1387 1447
1448sub decay_objects {
1449 my ($self) = @_;
1450
1451 return if $self->{deny_reset};
1452
1453 $self->do_decay_objects;
1454}
1455
1388sub unlink_save { 1456sub unlink_save {
1389 my ($self) = @_; 1457 my ($self) = @_;
1390 1458
1391 utf8::encode (my $save = $self->save_path); 1459 utf8::encode (my $save = $self->save_path);
1392 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1460 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1448 $self->load_header_orig 1516 $self->load_header_orig
1449 or return; 1517 or return;
1450 $self->prepare_orig; 1518 $self->prepare_orig;
1451 } 1519 }
1452 1520
1521 $self->{deny_reset} = 1
1522 if $self->no_reset;
1523
1453 $self->default_region (cf::region::find_by_path $self->{path}) 1524 $self->default_region (cf::region::find_by_path $self->{path})
1454 unless $self->default_region; 1525 unless $self->default_region;
1455 1526
1456 1 1527 1
1457} 1528}
… …
1472 $map->{last_save} = $cf::RUNTIME; 1543 $map->{last_save} = $cf::RUNTIME;
1473 1544
1474 $map->load_header 1545 $map->load_header
1475 or return; 1546 or return;
1476 1547
1477 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1478 # doing this can freeze the server in a sync job, obviously 1549 # doing this can freeze the server in a sync job, obviously
1479 #$cf::WAIT_FOR_TICK->wait; 1550 #$cf::WAIT_FOR_TICK->wait;
1480 $map->reset; 1551 $map->reset;
1481 undef $guard; 1552 undef $guard;
1482 return find $path; 1553 return find $path;
… …
1549 my ($self, $ob) = @_; 1620 my ($self, $ob) = @_;
1550 1621
1551 return find "~" . $ob->name . "/" . $self->{path} 1622 return find "~" . $ob->name . "/" . $self->{path}
1552 if $self->per_player; 1623 if $self->per_player;
1553 1624
1625# return find "?party/" . $ob->name . "/" . $self->{path}
1626# if $self->per_party;
1627
1554 $self 1628 $self
1555} 1629}
1556 1630
1557# 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
1558sub load_diag { 1632sub load_diag {
… …
1668 1742
1669sub reset_at { 1743sub reset_at {
1670 my ($self) = @_; 1744 my ($self) = @_;
1671 1745
1672 # TODO: safety, remove and allow resettable per-player maps 1746 # 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}; 1747 return 1e99 if $self->{deny_reset};
1675 1748
1676 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1749 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1677 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;
1678 1751
… …
1689 my ($self) = @_; 1762 my ($self) = @_;
1690 1763
1691 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1764 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 1765
1693 return if $self->players; 1766 return if $self->players;
1694 return if $self->isa ("ext::map_per_player");#d#
1695 1767
1696 warn "resetting map ", $self->path;#d# 1768 warn "resetting map ", $self->path;
1697 1769
1698 $self->in_memory (cf::MAP_SWAPPED); 1770 $self->in_memory (cf::MAP_SWAPPED);
1699 1771
1700 # need to save uniques path 1772 # need to save uniques path
1701 unless ($self->{deny_save}) { 1773 unless ($self->{deny_save}) {
… …
1733 $cf::MAP{$self->path} = $self; 1805 $cf::MAP{$self->path} = $self;
1734 1806
1735 $self->reset; # polite request, might not happen 1807 $self->reset; # polite request, might not happen
1736} 1808}
1737 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
1738=item cf::map::unique_maps 1846=item cf::map::unique_maps
1739 1847
1740Returns an arrayref of paths of all shared maps that have 1848Returns an arrayref of paths of all shared maps that have
1741instantiated unique items. May block. 1849instantiated unique items. May block.
1742 1850
1743=cut 1851=cut
1744 1852
1745sub unique_maps() { 1853sub unique_maps() {
1746 my $files = aio_readdir $UNIQUEDIR 1854 [
1747 or return; 1855 map {
1748
1749 my @paths;
1750
1751 for (@$files) {
1752 utf8::decode $_; 1856 utf8::decode $_;
1753 next if /\.pst$/; 1857 /\.map$/
1754 next unless /^$PATH_SEP/o; 1858 ? normalise $_
1755 1859 : ()
1756 push @paths, cf::map::normalise $_; 1860 } @{ aio_readdir $UNIQUEDIR or [] }
1757 } 1861 ]
1758
1759 \@paths
1760} 1862}
1761 1863
1762package cf; 1864package cf;
1763 1865
1764=back 1866=back
… …
1870 $self->deactivate_recursive; 1972 $self->deactivate_recursive;
1871 1973
1872 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1974 return if UNIVERSAL::isa $self->map, "ext::map_link";
1873 1975
1874 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1976 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1875 if $self->map; 1977 if $self->map && $self->map->{path} ne "{link}";
1876 1978
1877 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1979 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1878} 1980}
1879 1981
1880sub cf::object::player::leave_link { 1982sub cf::object::player::leave_link {
1881 my ($self, $map, $x, $y) = @_; 1983 my ($self, $map, $x, $y) = @_;
1984
1985 return unless $self->contr->active;
1882 1986
1883 my $link_pos = delete $self->{_link_pos}; 1987 my $link_pos = delete $self->{_link_pos};
1884 1988
1885 unless ($map) { 1989 unless ($map) {
1886 # restore original map position 1990 # restore original map position
… …
1909 2013
1910 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1911 $self->enter_map ($map, $x, $y); 2015 $self->enter_map ($map, $x, $y);
1912} 2016}
1913 2017
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) 2018=item $player_object->goto ($path, $x, $y[, $check->($map)])
1947 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
1948=cut 2025=cut
2026
2027our $GOTOGEN;
1949 2028
1950sub cf::object::player::goto { 2029sub cf::object::player::goto {
1951 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;
1952 2034
1953 $self->enter_link; 2035 $self->enter_link;
1954 2036
1955 (async { 2037 (async {
1956 my $map = eval { 2038 my $map = eval {
1957 my $map = cf::map::find $path; 2039 my $map = cf::map::find $path;
2040
2041 if ($map) {
1958 $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
1959 $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 $@;
1960 } or 2054 }
1961 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1962 2055
2056 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation};
1963 $self->leave_link ($map, $x, $y); 2058 $self->leave_link ($map, $x, $y);
2059 }
1964 })->prio (1); 2060 })->prio (1);
1965} 2061}
1966 2062
1967=item $player_object->enter_exit ($exit_object) 2063=item $player_object->enter_exit ($exit_object)
1968 2064
… …
2453 warn $@ if $@; 2549 warn $@ if $@;
2454 _exit 0; 2550 _exit 0;
2455 } 2551 }
2456} 2552}
2457 2553
2458
2459
2460############################################################################# 2554#############################################################################
2461# the server's init and main functions 2555# the server's init and main functions
2462 2556
2463sub load_facedata($) { 2557sub load_facedata($) {
2464 my ($path) = @_; 2558 my ($path) = @_;
… …
2535sub reload_resources { 2629sub reload_resources {
2536 warn "reloading resource files...\n"; 2630 warn "reloading resource files...\n";
2537 2631
2538 reload_regions; 2632 reload_regions;
2539 reload_facedata; 2633 reload_facedata;
2634 #reload_archetypes;#d#
2540 reload_archetypes; 2635 reload_archetypes;
2541 reload_treasures; 2636 reload_treasures;
2542 2637
2543 warn "finished reloading resource files\n"; 2638 warn "finished reloading resource files\n";
2544} 2639}
… …
2814 my $signal = new Coro::Signal; 2909 my $signal = new Coro::Signal;
2815 push @WAIT_FOR_TICK_BEGIN, $signal; 2910 push @WAIT_FOR_TICK_BEGIN, $signal;
2816 $signal->wait; 2911 $signal->wait;
2817} 2912}
2818 2913
2914 my $min = 1e6;#d#
2915 my $avg = 10;
2819$TICK_WATCHER = Event->timer ( 2916$TICK_WATCHER = Event->timer (
2820 reentrant => 0, 2917 reentrant => 0,
2821 parked => 1, 2918 parked => 1,
2822 prio => 0, 2919 prio => 0,
2823 at => $NEXT_TICK || $TICK, 2920 at => $NEXT_TICK || $TICK,
… …
2827 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2924 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2828 unless ++$bug_warning > 10; 2925 unless ++$bug_warning > 10;
2829 return; 2926 return;
2830 } 2927 }
2831 2928
2832 $NOW = Event::time; 2929 $NOW = $tick_start = Event::time;
2833 2930
2834 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 };
2835 2955
2836 $RUNTIME += $TICK; 2956 $RUNTIME += $TICK;
2837 $NEXT_TICK += $TICK; 2957 $NEXT_TICK += $TICK;
2838 2958
2839 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2845 } 2965 }
2846 2966
2847# my $AFTER = Event::time; 2967# my $AFTER = Event::time;
2848# warn $AFTER - $NOW;#d# 2968# warn $AFTER - $NOW;#d#
2849 2969
2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2971 $sig->send;
2972 }
2973 while (my $sig = shift @WAIT_FOR_TICK) {
2974 $sig->send;
2975 }
2976
2977 $NOW = Event::time;
2978
2850 # if we are delayed by four ticks or more, skip them all 2979 # if we are delayed by four ticks or more, skip them all
2851 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2852 2981
2853 $TICK_WATCHER->at ($NEXT_TICK); 2982 $TICK_WATCHER->at ($NEXT_TICK);
2854 $TICK_WATCHER->start; 2983 $TICK_WATCHER->start;
2855 2984
2856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2985 $LOAD = ($NOW - $tick_start) / $TICK;
2857 $sig->send; 2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2858 }
2859 while (my $sig = shift @WAIT_FOR_TICK) {
2860 $sig->send;
2861 }
2862 2987
2863 _post_tick; 2988 _post_tick;
2989
2990
2864 }, 2991 },
2865); 2992);
2866 2993
2867{ 2994{
2868 BDB::max_poll_time $TICK * 0.1; 2995 BDB::max_poll_time $TICK * 0.1;

Diff Legend

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