… | |
… | |
90 | our $LINK_MAP; # the special {link} map, which is always available |
90 | our $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 ∕ |
93 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
93 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
94 | |
94 | |
|
|
95 | our $LOAD; # a number between 0 (idle) and 1 (too many objects) |
|
|
96 | our $LOADAVG; # same thing, but with alpha-smoothing |
|
|
97 | our $tick_start; # for load detecting purposes |
|
|
98 | |
95 | binmode STDOUT; |
99 | binmode STDOUT; |
96 | binmode STDERR; |
100 | binmode STDERR; |
97 | |
101 | |
98 | # read virtual server time, if available |
102 | # read virtual server time, if available |
99 | unless ($RUNTIME || !-e "$LOCALDIR/runtime") { |
103 | unless ($RUNTIME || !-e "$LOCALDIR/runtime") { |
… | |
… | |
139 | |
143 | |
140 | =item $cf::TICK |
144 | =item $cf::TICK |
141 | |
145 | |
142 | The interval between server ticks, in seconds. |
146 | The interval between server ticks, in seconds. |
143 | |
147 | |
|
|
148 | =item $cf::LOADAVG |
|
|
149 | |
|
|
150 | The 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 |
|
|
152 | objects per tick. Healthy values are < 0.5. |
|
|
153 | |
|
|
154 | =item $cf::LOAD |
|
|
155 | |
|
|
156 | The raw value load value from the last tick. |
|
|
157 | |
144 | =item %cf::CFG |
158 | =item %cf::CFG |
145 | |
159 | |
146 | Configuration for the server, loaded from C</etc/crossfire/config>, or |
160 | Configuration for the server, loaded from C</etc/crossfire/config>, or |
147 | from wherever your confdir points to. |
161 | from 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. |
182 | for my $pkg (qw( |
197 | for my $pkg (qw( |
183 | cf::global cf::attachable |
198 | cf::global cf::attachable |
… | |
… | |
318 | |
333 | |
319 | sub sync_job(&) { |
334 | sub 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 | |
371 | sub write_runtime { |
395 | sub 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 |
654 | sub cf::attachable::detach { |
686 | sub 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 | |
665 | sub cf::attachable::attached { |
698 | sub 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 |
… | |
… | |
1272 | my ($self, $merge) = @_; |
1305 | my ($self, $merge) = @_; |
1273 | |
1306 | |
1274 | # we have to keep some variables in memory intact |
1307 | # we have to keep some variables in memory intact |
1275 | local $self->{path}; |
1308 | local $self->{path}; |
1276 | local $self->{load_path}; |
1309 | local $self->{load_path}; |
1277 | local $self->{deny_save}; |
|
|
1278 | local $self->{deny_reset}; |
|
|
1279 | |
1310 | |
1280 | $self->SUPER::thawer_merge ($merge); |
1311 | $self->SUPER::thawer_merge ($merge); |
1281 | } |
1312 | } |
1282 | |
1313 | |
1283 | sub normalise { |
1314 | sub normalise { |
… | |
… | |
1383 | |
1414 | |
1384 | $_->change_map_light ($change) |
1415 | $_->change_map_light ($change) |
1385 | for grep $_->outdoor, values %cf::MAP; |
1416 | for grep $_->outdoor, values %cf::MAP; |
1386 | } |
1417 | } |
1387 | |
1418 | |
|
|
1419 | sub decay_objects { |
|
|
1420 | my ($self) = @_; |
|
|
1421 | |
|
|
1422 | return if $self->{deny_reset}; |
|
|
1423 | |
|
|
1424 | $self->do_decay_objects; |
|
|
1425 | } |
|
|
1426 | |
1388 | sub unlink_save { |
1427 | sub unlink_save { |
1389 | my ($self) = @_; |
1428 | my ($self) = @_; |
1390 | |
1429 | |
1391 | utf8::encode (my $save = $self->save_path); |
1430 | utf8::encode (my $save = $self->save_path); |
1392 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
1431 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
… | |
… | |
1448 | $self->load_header_orig |
1487 | $self->load_header_orig |
1449 | or return; |
1488 | or return; |
1450 | $self->prepare_orig; |
1489 | $self->prepare_orig; |
1451 | } |
1490 | } |
1452 | |
1491 | |
|
|
1492 | $self->{deny_reset} = 1 |
|
|
1493 | if $self->no_reset; |
|
|
1494 | |
1453 | $self->default_region (cf::region::find_by_path $self->{path}) |
1495 | $self->default_region (cf::region::find_by_path $self->{path}) |
1454 | unless $self->default_region; |
1496 | unless $self->default_region; |
1455 | |
1497 | |
1456 | 1 |
1498 | 1 |
1457 | } |
1499 | } |
… | |
… | |
1472 | $map->{last_save} = $cf::RUNTIME; |
1514 | $map->{last_save} = $cf::RUNTIME; |
1473 | |
1515 | |
1474 | $map->load_header |
1516 | $map->load_header |
1475 | or return; |
1517 | or return; |
1476 | |
1518 | |
1477 | if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) |
1519 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1478 | # doing this can freeze the server in a sync job, obviously |
1520 | # doing this can freeze the server in a sync job, obviously |
1479 | #$cf::WAIT_FOR_TICK->wait; |
1521 | #$cf::WAIT_FOR_TICK->wait; |
1480 | $map->reset; |
1522 | $map->reset; |
1481 | undef $guard; |
1523 | undef $guard; |
1482 | return find $path; |
1524 | return find $path; |
… | |
… | |
1549 | my ($self, $ob) = @_; |
1591 | my ($self, $ob) = @_; |
1550 | |
1592 | |
1551 | return find "~" . $ob->name . "/" . $self->{path} |
1593 | return find "~" . $ob->name . "/" . $self->{path} |
1552 | if $self->per_player; |
1594 | if $self->per_player; |
1553 | |
1595 | |
|
|
1596 | # return find "?party/" . $ob->name . "/" . $self->{path} |
|
|
1597 | # if $self->per_party; |
|
|
1598 | |
1554 | $self |
1599 | $self |
1555 | } |
1600 | } |
1556 | |
1601 | |
1557 | # find and load all maps in the 3x3 area around a map |
1602 | # find and load all maps in the 3x3 area around a map |
1558 | sub load_diag { |
1603 | sub load_diag { |
… | |
… | |
1668 | |
1713 | |
1669 | sub reset_at { |
1714 | sub reset_at { |
1670 | my ($self) = @_; |
1715 | my ($self) = @_; |
1671 | |
1716 | |
1672 | # TODO: safety, remove and allow resettable per-player maps |
1717 | # 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}; |
1718 | return 1e99 if $self->{deny_reset}; |
1675 | |
1719 | |
1676 | my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; |
1720 | my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; |
1677 | my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; |
1721 | my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; |
1678 | |
1722 | |
… | |
… | |
1689 | my ($self) = @_; |
1733 | my ($self) = @_; |
1690 | |
1734 | |
1691 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1735 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1692 | |
1736 | |
1693 | return if $self->players; |
1737 | return if $self->players; |
1694 | return if $self->isa ("ext::map_per_player");#d# |
|
|
1695 | |
1738 | |
1696 | warn "resetting map ", $self->path;#d# |
1739 | warn "resetting map ", $self->path; |
1697 | |
1740 | |
1698 | $self->in_memory (cf::MAP_SWAPPED); |
1741 | $self->in_memory (cf::MAP_SWAPPED); |
1699 | |
1742 | |
1700 | # need to save uniques path |
1743 | # need to save uniques path |
1701 | unless ($self->{deny_save}) { |
1744 | unless ($self->{deny_save}) { |
… | |
… | |
1870 | $self->deactivate_recursive; |
1913 | $self->deactivate_recursive; |
1871 | |
1914 | |
1872 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1915 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1873 | |
1916 | |
1874 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1917 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1875 | if $self->map; |
1918 | if $self->map && $self->map->{path} ne "{link}"; |
1876 | |
1919 | |
1877 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1920 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1878 | } |
1921 | } |
1879 | |
1922 | |
1880 | sub cf::object::player::leave_link { |
1923 | sub cf::object::player::leave_link { |
1881 | my ($self, $map, $x, $y) = @_; |
1924 | my ($self, $map, $x, $y) = @_; |
|
|
1925 | |
|
|
1926 | return unless $self->contr->active; |
1882 | |
1927 | |
1883 | my $link_pos = delete $self->{_link_pos}; |
1928 | my $link_pos = delete $self->{_link_pos}; |
1884 | |
1929 | |
1885 | unless ($map) { |
1930 | unless ($map) { |
1886 | # restore original map position |
1931 | # restore original map position |
… | |
… | |
1909 | |
1954 | |
1910 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
1955 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
1911 | $self->enter_map ($map, $x, $y); |
1956 | $self->enter_map ($map, $x, $y); |
1912 | } |
1957 | } |
1913 | |
1958 | |
1914 | cf::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) |
1959 | =item $player_object->goto ($path, $x, $y[, $check->($map)]) |
1947 | |
1960 | |
|
|
1961 | Moves the player to the given map-path and coordinates by first freezing |
|
|
1962 | her, loading and preparing them map, calling the provided $check callback |
|
|
1963 | that has to return the map if sucecssful, and then unfreezes the player on |
|
|
1964 | the new (success) or old (failed) map position. |
|
|
1965 | |
1948 | =cut |
1966 | =cut |
|
|
1967 | |
|
|
1968 | our $GOTOGEN; |
1949 | |
1969 | |
1950 | sub cf::object::player::goto { |
1970 | sub cf::object::player::goto { |
1951 | my ($self, $path, $x, $y) = @_; |
1971 | my ($self, $path, $x, $y, $check) = @_; |
|
|
1972 | |
|
|
1973 | # do generation counting so two concurrent goto's will be executed in-order |
|
|
1974 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
1952 | |
1975 | |
1953 | $self->enter_link; |
1976 | $self->enter_link; |
1954 | |
1977 | |
1955 | (async { |
1978 | (async { |
1956 | my $map = eval { |
1979 | my $map = eval { |
1957 | my $map = cf::map::find $path; |
1980 | my $map = cf::map::find $path; |
|
|
1981 | |
|
|
1982 | if ($map) { |
1958 | $map = $map->customise_for ($self) if $map; |
1983 | $map = $map->customise_for ($self); |
|
|
1984 | $map = $check->($map) if $check && $map; |
|
|
1985 | } else { |
|
|
1986 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1987 | } |
|
|
1988 | |
1959 | $map |
1989 | $map |
|
|
1990 | }; |
|
|
1991 | |
|
|
1992 | if ($@) { |
|
|
1993 | $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1994 | LOG llevError | logBacktrace, Carp::longmess $@; |
1960 | } or |
1995 | } |
1961 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1962 | |
1996 | |
|
|
1997 | if ($gen == $self->{_goto_generation}) { |
|
|
1998 | delete $self->{_goto_generation}; |
1963 | $self->leave_link ($map, $x, $y); |
1999 | $self->leave_link ($map, $x, $y); |
|
|
2000 | } |
1964 | })->prio (1); |
2001 | })->prio (1); |
1965 | } |
2002 | } |
1966 | |
2003 | |
1967 | =item $player_object->enter_exit ($exit_object) |
2004 | =item $player_object->enter_exit ($exit_object) |
1968 | |
2005 | |
… | |
… | |
2453 | warn $@ if $@; |
2490 | warn $@ if $@; |
2454 | _exit 0; |
2491 | _exit 0; |
2455 | } |
2492 | } |
2456 | } |
2493 | } |
2457 | |
2494 | |
2458 | |
|
|
2459 | |
|
|
2460 | ############################################################################# |
2495 | ############################################################################# |
2461 | # the server's init and main functions |
2496 | # the server's init and main functions |
2462 | |
2497 | |
2463 | sub load_facedata($) { |
2498 | sub load_facedata($) { |
2464 | my ($path) = @_; |
2499 | my ($path) = @_; |
… | |
… | |
2535 | sub reload_resources { |
2570 | sub reload_resources { |
2536 | warn "reloading resource files...\n"; |
2571 | warn "reloading resource files...\n"; |
2537 | |
2572 | |
2538 | reload_regions; |
2573 | reload_regions; |
2539 | reload_facedata; |
2574 | reload_facedata; |
|
|
2575 | #reload_archetypes;#d# |
2540 | reload_archetypes; |
2576 | reload_archetypes; |
2541 | reload_treasures; |
2577 | reload_treasures; |
2542 | |
2578 | |
2543 | warn "finished reloading resource files\n"; |
2579 | warn "finished reloading resource files\n"; |
2544 | } |
2580 | } |
… | |
… | |
2814 | my $signal = new Coro::Signal; |
2850 | my $signal = new Coro::Signal; |
2815 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2851 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2816 | $signal->wait; |
2852 | $signal->wait; |
2817 | } |
2853 | } |
2818 | |
2854 | |
|
|
2855 | my $min = 1e6;#d# |
|
|
2856 | my $avg = 10; |
2819 | $TICK_WATCHER = Event->timer ( |
2857 | $TICK_WATCHER = Event->timer ( |
2820 | reentrant => 0, |
2858 | reentrant => 0, |
2821 | parked => 1, |
2859 | parked => 1, |
2822 | prio => 0, |
2860 | prio => 0, |
2823 | at => $NEXT_TICK || $TICK, |
2861 | at => $NEXT_TICK || $TICK, |
… | |
… | |
2827 | Carp::cluck "major BUG: server tick called outside of main coro, skipping it" |
2865 | Carp::cluck "major BUG: server tick called outside of main coro, skipping it" |
2828 | unless ++$bug_warning > 10; |
2866 | unless ++$bug_warning > 10; |
2829 | return; |
2867 | return; |
2830 | } |
2868 | } |
2831 | |
2869 | |
2832 | $NOW = Event::time; |
2870 | $NOW = $tick_start = Event::time; |
2833 | |
2871 | |
2834 | cf::server_tick; # one server iteration |
2872 | cf::server_tick; # one server iteration |
|
|
2873 | |
|
|
2874 | 0 && sync_job {#d# |
|
|
2875 | for(1..10) { |
|
|
2876 | my $t = Event::time; |
|
|
2877 | my $map = my $map = new_from_path cf::map "/tmp/x.map" |
|
|
2878 | or die; |
|
|
2879 | |
|
|
2880 | $map->width (50); |
|
|
2881 | $map->height (50); |
|
|
2882 | $map->alloc; |
|
|
2883 | $map->_load_objects ("/tmp/x.map", 1); |
|
|
2884 | my $t = Event::time - $t; |
|
|
2885 | |
|
|
2886 | #next unless $t < 0.0013;#d# |
|
|
2887 | if ($t < $min) { |
|
|
2888 | $min = $t; |
|
|
2889 | } |
|
|
2890 | $avg = $avg * 0.99 + $t * 0.01; |
|
|
2891 | } |
|
|
2892 | warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d# |
|
|
2893 | exit 0; |
|
|
2894 | # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477 |
|
|
2895 | }; |
2835 | |
2896 | |
2836 | $RUNTIME += $TICK; |
2897 | $RUNTIME += $TICK; |
2837 | $NEXT_TICK += $TICK; |
2898 | $NEXT_TICK += $TICK; |
2838 | |
2899 | |
2839 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
2900 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
… | |
… | |
2845 | } |
2906 | } |
2846 | |
2907 | |
2847 | # my $AFTER = Event::time; |
2908 | # my $AFTER = Event::time; |
2848 | # warn $AFTER - $NOW;#d# |
2909 | # warn $AFTER - $NOW;#d# |
2849 | |
2910 | |
|
|
2911 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
|
|
2912 | $sig->send; |
|
|
2913 | } |
|
|
2914 | while (my $sig = shift @WAIT_FOR_TICK) { |
|
|
2915 | $sig->send; |
|
|
2916 | } |
|
|
2917 | |
|
|
2918 | $NOW = Event::time; |
|
|
2919 | |
2850 | # if we are delayed by four ticks or more, skip them all |
2920 | # if we are delayed by four ticks or more, skip them all |
2851 | $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; |
2921 | $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; |
2852 | |
2922 | |
2853 | $TICK_WATCHER->at ($NEXT_TICK); |
2923 | $TICK_WATCHER->at ($NEXT_TICK); |
2854 | $TICK_WATCHER->start; |
2924 | $TICK_WATCHER->start; |
2855 | |
2925 | |
2856 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
2926 | $LOAD = ($NOW - $tick_start) / $TICK; |
2857 | $sig->send; |
2927 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
2858 | } |
|
|
2859 | while (my $sig = shift @WAIT_FOR_TICK) { |
|
|
2860 | $sig->send; |
|
|
2861 | } |
|
|
2862 | |
2928 | |
2863 | _post_tick; |
2929 | _post_tick; |
|
|
2930 | |
|
|
2931 | |
2864 | }, |
2932 | }, |
2865 | ); |
2933 | ); |
2866 | |
2934 | |
2867 | { |
2935 | { |
2868 | BDB::max_poll_time $TICK * 0.1; |
2936 | BDB::max_poll_time $TICK * 0.1; |