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.264 by root, Sun May 6 05:44:48 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->()
… …
372 my $runtime = "$LOCALDIR/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
373 397
374 # first touch the runtime file to show we are still running: 398 # first touch the runtime file to show we are still running:
375 # the fsync below can take a very very long time. 399 # the fsync below can take a very very long time.
376 400
377 warn "touching runtime...\n";#d# 401 IO::AIO::aio_utime $runtime, undef, undef;
378 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
379 utime undef, undef, $fh;
380 }
381 402
382 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
383 404
384 warn "starting to write runtime...\n";#d#
385 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
386 or return; 406 or return;
387 407
388 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
389 # 10 is the runtime save interval, for a monotonic clock 409 # 10 is the runtime save interval, for a monotonic clock
… …
395 # always fsync - this file is important 415 # always fsync - this file is important
396 aio_fsync $fh 416 aio_fsync $fh
397 and return; 417 and return;
398 418
399 # touch it again to show we are up-to-date 419 # touch it again to show we are up-to-date
400 utime undef, undef, $fh; 420 aio_utime $fh, undef, undef;
401 421
402 close $fh 422 close $fh
403 or return; 423 or return;
404 424
405 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
406 and return; 426 and return;
407 427
408 warn "... done writing runtime.\n";#d# 428 warn "runtime file written.\n";
409 429
410 1 430 1
411} 431}
412 432
413=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
606 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
607 627
608 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
609 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
610 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
611 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
612 632
613 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
614 my $pkg = shift @arg; 634 my $pkg = shift @arg;
615 635
616 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
657 if (ref $_[0]) { 677 if (ref $_[0]) {
658 _object_attach @_; 678 _object_attach @_;
659 } else { 679 } else {
660 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
661 } 681 }
682 _recalc_want;
662}; 683};
663 684
664# all those should be optimised 685# all those should be optimised
665sub cf::attachable::detach { 686sub cf::attachable::detach {
666 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
669 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
670 reattach ($obj); 691 reattach ($obj);
671 } else { 692 } else {
672 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
673 } 694 }
695 _recalc_want;
674}; 696};
675 697
676sub cf::attachable::attached { 698sub cf::attachable::attached {
677 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
678 700
… …
851 or return; 873 or return;
852 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
853 } 875 }
854 876
855 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
856 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
857 return ($data, $av); 879 return ($data, $av);
858} 880}
859 881
860############################################################################# 882#############################################################################
861# command handling &c 883# command handling &c
… …
921 943
922 cf::override; 944 cf::override;
923 }, 945 },
924); 946);
925 947
926sub load_extension {
927 my ($path) = @_;
928
929 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
930 my $base = $1;
931 my $pkg = $1;
932 $pkg =~ s/[^[:word:]]/_/g;
933 $pkg = "ext::$pkg";
934
935 warn "... loading '$path' into '$pkg'\n";
936
937 open my $fh, "<:utf8", $path
938 or die "$path: $!";
939
940 my $source =
941 "package $pkg; use strict; use utf8;\n"
942 . "#line 1 \"$path\"\n{\n"
943 . (do { local $/; <$fh> })
944 . "\n};\n1";
945
946 unless (eval $source) {
947 my $msg = $@ ? "$path: $@\n"
948 : "extension disabled.\n";
949 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
950 warn $@;
951 warn "mandatory extension failed to load, exiting.\n";
952 exit 1;
953 }
954 die $@;
955 }
956
957 push @EXTS, $pkg;
958}
959
960sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
961 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
962 next unless -r $ext; 953 next unless -r $path;
963 eval { 954
964 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};
965 1 1011 }
966 } or warn "$ext not loaded: $@"; 1012
1013 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress;
1016 }
967 } 1017 };
968} 1018}
969 1019
970############################################################################# 1020#############################################################################
971 1021
972=head2 CORE EXTENSIONS 1022=head2 CORE EXTENSIONS
… …
1283 my ($self, $merge) = @_; 1333 my ($self, $merge) = @_;
1284 1334
1285 # we have to keep some variables in memory intact 1335 # we have to keep some variables in memory intact
1286 local $self->{path}; 1336 local $self->{path};
1287 local $self->{load_path}; 1337 local $self->{load_path};
1288 local $self->{deny_save};
1289 local $self->{deny_reset};
1290 1338
1291 $self->SUPER::thawer_merge ($merge); 1339 $self->SUPER::thawer_merge ($merge);
1292} 1340}
1293 1341
1294sub normalise { 1342sub normalise {
… …
1394 1442
1395 $_->change_map_light ($change) 1443 $_->change_map_light ($change)
1396 for grep $_->outdoor, values %cf::MAP; 1444 for grep $_->outdoor, values %cf::MAP;
1397} 1445}
1398 1446
1447sub decay_objects {
1448 my ($self) = @_;
1449
1450 return if $self->{deny_reset};
1451
1452 $self->do_decay_objects;
1453}
1454
1399sub unlink_save { 1455sub unlink_save {
1400 my ($self) = @_; 1456 my ($self) = @_;
1401 1457
1402 utf8::encode (my $save = $self->save_path); 1458 utf8::encode (my $save = $self->save_path);
1403 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1459 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1459 $self->load_header_orig 1515 $self->load_header_orig
1460 or return; 1516 or return;
1461 $self->prepare_orig; 1517 $self->prepare_orig;
1462 } 1518 }
1463 1519
1520 $self->{deny_reset} = 1
1521 if $self->no_reset;
1522
1464 $self->default_region (cf::region::find_by_path $self->{path}) 1523 $self->default_region (cf::region::find_by_path $self->{path})
1465 unless $self->default_region; 1524 unless $self->default_region;
1466 1525
1467 1 1526 1
1468} 1527}
… …
1483 $map->{last_save} = $cf::RUNTIME; 1542 $map->{last_save} = $cf::RUNTIME;
1484 1543
1485 $map->load_header 1544 $map->load_header
1486 or return; 1545 or return;
1487 1546
1488 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1489 # doing this can freeze the server in a sync job, obviously 1548 # doing this can freeze the server in a sync job, obviously
1490 #$cf::WAIT_FOR_TICK->wait; 1549 #$cf::WAIT_FOR_TICK->wait;
1491 $map->reset; 1550 $map->reset;
1492 undef $guard; 1551 undef $guard;
1493 return find $path; 1552 return find $path;
… …
1560 my ($self, $ob) = @_; 1619 my ($self, $ob) = @_;
1561 1620
1562 return find "~" . $ob->name . "/" . $self->{path} 1621 return find "~" . $ob->name . "/" . $self->{path}
1563 if $self->per_player; 1622 if $self->per_player;
1564 1623
1624# return find "?party/" . $ob->name . "/" . $self->{path}
1625# if $self->per_party;
1626
1565 $self 1627 $self
1566} 1628}
1567 1629
1568# 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
1569sub load_diag { 1631sub load_diag {
… …
1679 1741
1680sub reset_at { 1742sub reset_at {
1681 my ($self) = @_; 1743 my ($self) = @_;
1682 1744
1683 # TODO: safety, remove and allow resettable per-player maps 1745 # TODO: safety, remove and allow resettable per-player maps
1684 return 1e99 if $self->isa ("ext::map_per_player");#d#
1685 return 1e99 if $self->{deny_reset}; 1746 return 1e99 if $self->{deny_reset};
1686 1747
1687 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1748 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1688 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;
1689 1750
… …
1700 my ($self) = @_; 1761 my ($self) = @_;
1701 1762
1702 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1763 my $lock = cf::lock_acquire "map_data:$self->{path}";
1703 1764
1704 return if $self->players; 1765 return if $self->players;
1705 return if $self->isa ("ext::map_per_player");#d#
1706 1766
1707 warn "resetting map ", $self->path;#d# 1767 warn "resetting map ", $self->path;
1708 1768
1709 $self->in_memory (cf::MAP_SWAPPED); 1769 $self->in_memory (cf::MAP_SWAPPED);
1710 1770
1711 # need to save uniques path 1771 # need to save uniques path
1712 unless ($self->{deny_save}) { 1772 unless ($self->{deny_save}) {
… …
1744 $cf::MAP{$self->path} = $self; 1804 $cf::MAP{$self->path} = $self;
1745 1805
1746 $self->reset; # polite request, might not happen 1806 $self->reset; # polite request, might not happen
1747} 1807}
1748 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
1749=item cf::map::unique_maps 1845=item cf::map::unique_maps
1750 1846
1751Returns an arrayref of paths of all shared maps that have 1847Returns an arrayref of paths of all shared maps that have
1752instantiated unique items. May block. 1848instantiated unique items. May block.
1753 1849
1754=cut 1850=cut
1755 1851
1756sub unique_maps() { 1852sub unique_maps() {
1757 my $files = aio_readdir $UNIQUEDIR 1853 [
1758 or return; 1854 map {
1759
1760 my @paths;
1761
1762 for (@$files) {
1763 utf8::decode $_; 1855 utf8::decode $_;
1764 next if /\.pst$/; 1856 /\.map$/
1765 next unless /^$PATH_SEP/o; 1857 ? normalise $_
1766 1858 : ()
1767 push @paths, cf::map::normalise $_; 1859 } @{ aio_readdir $UNIQUEDIR or [] }
1768 } 1860 ]
1769
1770 \@paths
1771} 1861}
1772 1862
1773package cf; 1863package cf;
1774 1864
1775=back 1865=back
… …
1881 $self->deactivate_recursive; 1971 $self->deactivate_recursive;
1882 1972
1883 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1973 return if UNIVERSAL::isa $self->map, "ext::map_link";
1884 1974
1885 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1975 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1886 if $self->map; 1976 if $self->map && $self->map->{path} ne "{link}";
1887 1977
1888 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1978 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1889} 1979}
1890 1980
1891sub cf::object::player::leave_link { 1981sub cf::object::player::leave_link {
1892 my ($self, $map, $x, $y) = @_; 1982 my ($self, $map, $x, $y) = @_;
1983
1984 return unless $self->contr->active;
1893 1985
1894 my $link_pos = delete $self->{_link_pos}; 1986 my $link_pos = delete $self->{_link_pos};
1895 1987
1896 unless ($map) { 1988 unless ($map) {
1897 # restore original map position 1989 # restore original map position
… …
1920 2012
1921 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1922 $self->enter_map ($map, $x, $y); 2014 $self->enter_map ($map, $x, $y);
1923} 2015}
1924 2016
1925cf::player->attach (
1926 on_logout => sub {
1927 my ($pl) = @_;
1928
1929 # abort map switching before logout
1930 if ($pl->ob->{_link_pos}) {
1931 cf::sync_job {
1932 $pl->ob->leave_link
1933 };
1934 }
1935 },
1936 on_login => sub {
1937 my ($pl) = @_;
1938
1939 # try to abort aborted map switching on player login :)
1940 # should happen only on crashes
1941 if ($pl->ob->{_link_pos}) {
1942 $pl->ob->enter_link;
1943 (async {
1944 $pl->ob->reply (undef,
1945 "There was an internal problem at your last logout, "
1946 . "the server will try to bring you to your intended destination in a second.",
1947 cf::NDI_RED);
1948 # we need this sleep as the login has a concurrent enter_exit running
1949 # and this sleep increases chances of the player not ending up in scorn
1950 Coro::Timer::sleep 1;
1951 $pl->ob->leave_link;
1952 })->prio (2);
1953 }
1954 },
1955);
1956
1957=item $player_object->goto ($path, $x, $y) 2017=item $player_object->goto ($path, $x, $y[, $check->($map)])
1958 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
1959=cut 2024=cut
2025
2026our $GOTOGEN;
1960 2027
1961sub cf::object::player::goto { 2028sub cf::object::player::goto {
1962 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;
1963 2033
1964 $self->enter_link; 2034 $self->enter_link;
1965 2035
1966 (async { 2036 (async {
1967 my $map = eval { 2037 my $map = eval {
1968 my $map = cf::map::find $path; 2038 my $map = cf::map::find $path;
2039
2040 if ($map) {
1969 $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
1970 $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 $@;
1971 } or 2053 }
1972 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1973 2054
2055 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation};
1974 $self->leave_link ($map, $x, $y); 2057 $self->leave_link ($map, $x, $y);
2058 }
1975 })->prio (1); 2059 })->prio (1);
1976} 2060}
1977 2061
1978=item $player_object->enter_exit ($exit_object) 2062=item $player_object->enter_exit ($exit_object)
1979 2063
… …
2464 warn $@ if $@; 2548 warn $@ if $@;
2465 _exit 0; 2549 _exit 0;
2466 } 2550 }
2467} 2551}
2468 2552
2469
2470
2471############################################################################# 2553#############################################################################
2472# the server's init and main functions 2554# the server's init and main functions
2473 2555
2474sub load_facedata($) { 2556sub load_facedata($) {
2475 my ($path) = @_; 2557 my ($path) = @_;
… …
2546sub reload_resources { 2628sub reload_resources {
2547 warn "reloading resource files...\n"; 2629 warn "reloading resource files...\n";
2548 2630
2549 reload_regions; 2631 reload_regions;
2550 reload_facedata; 2632 reload_facedata;
2633 #reload_archetypes;#d#
2551 reload_archetypes; 2634 reload_archetypes;
2552 reload_treasures; 2635 reload_treasures;
2553 2636
2554 warn "finished reloading resource files\n"; 2637 warn "finished reloading resource files\n";
2555} 2638}
… …
2825 my $signal = new Coro::Signal; 2908 my $signal = new Coro::Signal;
2826 push @WAIT_FOR_TICK_BEGIN, $signal; 2909 push @WAIT_FOR_TICK_BEGIN, $signal;
2827 $signal->wait; 2910 $signal->wait;
2828} 2911}
2829 2912
2913 my $min = 1e6;#d#
2914 my $avg = 10;
2830$TICK_WATCHER = Event->timer ( 2915$TICK_WATCHER = Event->timer (
2831 reentrant => 0, 2916 reentrant => 0,
2832 parked => 1, 2917 parked => 1,
2833 prio => 0, 2918 prio => 0,
2834 at => $NEXT_TICK || $TICK, 2919 at => $NEXT_TICK || $TICK,
… …
2838 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"
2839 unless ++$bug_warning > 10; 2924 unless ++$bug_warning > 10;
2840 return; 2925 return;
2841 } 2926 }
2842 2927
2843 $NOW = Event::time; 2928 $NOW = $tick_start = Event::time;
2844 2929
2845 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 };
2846 2954
2847 $RUNTIME += $TICK; 2955 $RUNTIME += $TICK;
2848 $NEXT_TICK += $TICK; 2956 $NEXT_TICK += $TICK;
2849 2957
2850 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2856 } 2964 }
2857 2965
2858# my $AFTER = Event::time; 2966# my $AFTER = Event::time;
2859# warn $AFTER - $NOW;#d# 2967# warn $AFTER - $NOW;#d#
2860 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
2861 # 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
2862 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2863 2980
2864 $TICK_WATCHER->at ($NEXT_TICK); 2981 $TICK_WATCHER->at ($NEXT_TICK);
2865 $TICK_WATCHER->start; 2982 $TICK_WATCHER->start;
2866 2983
2867 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2984 $LOAD = ($NOW - $tick_start) / $TICK;
2868 $sig->send; 2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2869 }
2870 while (my $sig = shift @WAIT_FOR_TICK) {
2871 $sig->send;
2872 }
2873 2986
2874 _post_tick; 2987 _post_tick;
2988
2989
2875 }, 2990 },
2876); 2991);
2877 2992
2878{ 2993{
2879 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