… | |
… | |
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") { |
… | |
… | |
138 | The time of the last (current) server tick. |
142 | The time of the last (current) server tick. |
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. |
|
|
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. |
143 | |
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. |
… | |
… | |
318 | |
332 | |
319 | sub sync_job(&) { |
333 | sub sync_job(&) { |
320 | my ($job) = @_; |
334 | my ($job) = @_; |
321 | |
335 | |
322 | if ($Coro::current == $Coro::main) { |
336 | if ($Coro::current == $Coro::main) { |
|
|
337 | my $time = Event::time; |
|
|
338 | |
323 | # this is the main coro, too bad, we have to block |
339 | # this is the main coro, too bad, we have to block |
324 | # till the operation succeeds, freezing the server :/ |
340 | # till the operation succeeds, freezing the server :/ |
325 | |
341 | |
326 | # TODO: use suspend/resume instead |
342 | # TODO: use suspend/resume instead |
327 | # (but this is cancel-safe) |
343 | # (but this is cancel-safe) |
… | |
… | |
338 | |
354 | |
339 | while ($busy) { |
355 | while ($busy) { |
340 | Coro::cede or Event::one_event; |
356 | Coro::cede or Event::one_event; |
341 | } |
357 | } |
342 | |
358 | |
|
|
359 | $time = Event::time - $time; |
|
|
360 | |
|
|
361 | LOG llevError | logBacktrace, Carp::longmess "long sync job" |
|
|
362 | if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; |
|
|
363 | |
|
|
364 | $tick_start += $time; # do not account sync jobs to server load |
|
|
365 | |
343 | wantarray ? @res : $res[0] |
366 | wantarray ? @res : $res[0] |
344 | } else { |
367 | } else { |
345 | # we are in another coroutine, how wonderful, everything just works |
368 | # we are in another coroutine, how wonderful, everything just works |
346 | |
369 | |
347 | $job->() |
370 | $job->() |
… | |
… | |
372 | my $runtime = "$LOCALDIR/runtime"; |
395 | my $runtime = "$LOCALDIR/runtime"; |
373 | |
396 | |
374 | # first touch the runtime file to show we are still running: |
397 | # first touch the runtime file to show we are still running: |
375 | # the fsync below can take a very very long time. |
398 | # the fsync below can take a very very long time. |
376 | |
399 | |
377 | warn "touching runtime...\n";#d# |
|
|
378 | if (my $fh = aio_open $runtime, O_WRONLY, 0) { |
400 | if (my $fh = aio_open $runtime, O_WRONLY, 0) { |
379 | utime undef, undef, $fh; |
401 | utime undef, undef, $fh; |
380 | } |
402 | } |
381 | |
403 | |
382 | my $guard = cf::lock_acquire "write_runtime"; |
404 | my $guard = cf::lock_acquire "write_runtime"; |
383 | |
405 | |
384 | warn "starting to write runtime...\n";#d# |
|
|
385 | my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 |
406 | my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 |
386 | or return; |
407 | or return; |
387 | |
408 | |
388 | my $value = $cf::RUNTIME + 90 + 10; |
409 | my $value = $cf::RUNTIME + 90 + 10; |
389 | # 10 is the runtime save interval, for a monotonic clock |
410 | # 10 is the runtime save interval, for a monotonic clock |
… | |
… | |
403 | or return; |
424 | or return; |
404 | |
425 | |
405 | aio_rename "$runtime~", $runtime |
426 | aio_rename "$runtime~", $runtime |
406 | and return; |
427 | and return; |
407 | |
428 | |
408 | warn "... done writing runtime.\n";#d# |
429 | warn "runtime file written.\n";#d# |
409 | |
430 | |
410 | 1 |
431 | 1 |
411 | } |
432 | } |
412 | |
433 | |
413 | =item cf::datalog type => key => value, ... |
434 | =item cf::datalog type => key => value, ... |
… | |
… | |
606 | $registry = $CB_TYPE[$object_type] ||= []; |
627 | $registry = $CB_TYPE[$object_type] ||= []; |
607 | |
628 | |
608 | } elsif ($type eq "subtype") { |
629 | } elsif ($type eq "subtype") { |
609 | defined $object_type or Carp::croak "subtype specified without type"; |
630 | defined $object_type or Carp::croak "subtype specified without type"; |
610 | my $object_subtype = shift @arg; |
631 | my $object_subtype = shift @arg; |
611 | $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; |
632 | $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= []; |
612 | |
633 | |
613 | } elsif ($type eq "package") { |
634 | } elsif ($type eq "package") { |
614 | my $pkg = shift @arg; |
635 | my $pkg = shift @arg; |
615 | |
636 | |
616 | while (my ($name, $id) = each %cb_id) { |
637 | while (my ($name, $id) = each %cb_id) { |
… | |
… | |
657 | if (ref $_[0]) { |
678 | if (ref $_[0]) { |
658 | _object_attach @_; |
679 | _object_attach @_; |
659 | } else { |
680 | } else { |
660 | _attach shift->_attach_registry, @_; |
681 | _attach shift->_attach_registry, @_; |
661 | } |
682 | } |
|
|
683 | _recalc_want; |
662 | }; |
684 | }; |
663 | |
685 | |
664 | # all those should be optimised |
686 | # all those should be optimised |
665 | sub cf::attachable::detach { |
687 | sub cf::attachable::detach { |
666 | my ($obj, $name) = @_; |
688 | my ($obj, $name) = @_; |
… | |
… | |
669 | delete $obj->{_attachment}{$name}; |
691 | delete $obj->{_attachment}{$name}; |
670 | reattach ($obj); |
692 | reattach ($obj); |
671 | } else { |
693 | } else { |
672 | Carp::croak "cannot, currently, detach class attachments"; |
694 | Carp::croak "cannot, currently, detach class attachments"; |
673 | } |
695 | } |
|
|
696 | _recalc_want; |
674 | }; |
697 | }; |
675 | |
698 | |
676 | sub cf::attachable::attached { |
699 | sub cf::attachable::attached { |
677 | my ($obj, $name) = @_; |
700 | my ($obj, $name) = @_; |
678 | |
701 | |
… | |
… | |
1881 | $self->deactivate_recursive; |
1904 | $self->deactivate_recursive; |
1882 | |
1905 | |
1883 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1906 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1884 | |
1907 | |
1885 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1908 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1886 | if $self->map; |
1909 | if $self->map && $self->map->{path} ne "{link}"; |
1887 | |
1910 | |
1888 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1911 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1889 | } |
1912 | } |
1890 | |
1913 | |
1891 | sub cf::object::player::leave_link { |
1914 | sub cf::object::player::leave_link { |
1892 | my ($self, $map, $x, $y) = @_; |
1915 | my ($self, $map, $x, $y) = @_; |
|
|
1916 | |
|
|
1917 | return unless $self->contr->active; |
1893 | |
1918 | |
1894 | my $link_pos = delete $self->{_link_pos}; |
1919 | my $link_pos = delete $self->{_link_pos}; |
1895 | |
1920 | |
1896 | unless ($map) { |
1921 | unless ($map) { |
1897 | # restore original map position |
1922 | # restore original map position |
… | |
… | |
1920 | |
1945 | |
1921 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
1946 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
1922 | $self->enter_map ($map, $x, $y); |
1947 | $self->enter_map ($map, $x, $y); |
1923 | } |
1948 | } |
1924 | |
1949 | |
1925 | cf::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) |
1950 | =item $player_object->goto ($path, $x, $y[, $check->($map)]) |
1958 | |
1951 | |
|
|
1952 | Moves the player to the given map-path and coordinates by first freezing |
|
|
1953 | her, loading and preparing them map, calling the provided $check callback |
|
|
1954 | that has to return the map if sucecssful, and then unfreezes the player on |
|
|
1955 | the new (success) or old (failed) map position. |
|
|
1956 | |
1959 | =cut |
1957 | =cut |
|
|
1958 | |
|
|
1959 | our $GOTOGEN; |
1960 | |
1960 | |
1961 | sub cf::object::player::goto { |
1961 | sub cf::object::player::goto { |
1962 | my ($self, $path, $x, $y) = @_; |
1962 | my ($self, $path, $x, $y, $check) = @_; |
|
|
1963 | |
|
|
1964 | # do generation counting so two concurrent goto's will be executed in-order |
|
|
1965 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
1963 | |
1966 | |
1964 | $self->enter_link; |
1967 | $self->enter_link; |
1965 | |
1968 | |
1966 | (async { |
1969 | (async { |
1967 | my $map = eval { |
1970 | my $map = eval { |
1968 | my $map = cf::map::find $path; |
1971 | my $map = cf::map::find $path; |
|
|
1972 | |
|
|
1973 | if ($map) { |
1969 | $map = $map->customise_for ($self) if $map; |
1974 | $map = $map->customise_for ($self); |
|
|
1975 | $map = $check->($map) if $check && $map; |
|
|
1976 | } else { |
|
|
1977 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1978 | } |
|
|
1979 | |
1970 | $map |
1980 | $map |
|
|
1981 | }; |
|
|
1982 | |
|
|
1983 | if ($@) { |
|
|
1984 | $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1985 | LOG llevError | logBacktrace, Carp::longmess $@; |
1971 | } or |
1986 | } |
1972 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1973 | |
1987 | |
|
|
1988 | if ($gen == $self->{_goto_generation}) { |
|
|
1989 | delete $self->{_goto_generation}; |
1974 | $self->leave_link ($map, $x, $y); |
1990 | $self->leave_link ($map, $x, $y); |
|
|
1991 | } |
1975 | })->prio (1); |
1992 | })->prio (1); |
1976 | } |
1993 | } |
1977 | |
1994 | |
1978 | =item $player_object->enter_exit ($exit_object) |
1995 | =item $player_object->enter_exit ($exit_object) |
1979 | |
1996 | |
… | |
… | |
2825 | my $signal = new Coro::Signal; |
2842 | my $signal = new Coro::Signal; |
2826 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2843 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2827 | $signal->wait; |
2844 | $signal->wait; |
2828 | } |
2845 | } |
2829 | |
2846 | |
|
|
2847 | my $min = 1e6;#d# |
|
|
2848 | my $avg = 10; |
2830 | $TICK_WATCHER = Event->timer ( |
2849 | $TICK_WATCHER = Event->timer ( |
2831 | reentrant => 0, |
2850 | reentrant => 0, |
2832 | parked => 1, |
2851 | parked => 1, |
2833 | prio => 0, |
2852 | prio => 0, |
2834 | at => $NEXT_TICK || $TICK, |
2853 | at => $NEXT_TICK || $TICK, |
… | |
… | |
2838 | Carp::cluck "major BUG: server tick called outside of main coro, skipping it" |
2857 | Carp::cluck "major BUG: server tick called outside of main coro, skipping it" |
2839 | unless ++$bug_warning > 10; |
2858 | unless ++$bug_warning > 10; |
2840 | return; |
2859 | return; |
2841 | } |
2860 | } |
2842 | |
2861 | |
2843 | $NOW = Event::time; |
2862 | $NOW = $tick_start = Event::time; |
2844 | |
2863 | |
2845 | cf::server_tick; # one server iteration |
2864 | cf::server_tick; # one server iteration |
|
|
2865 | |
|
|
2866 | 0 && sync_job {#d# |
|
|
2867 | for(1..10) { |
|
|
2868 | my $t = Event::time; |
|
|
2869 | my $map = my $map = new_from_path cf::map "/tmp/x.map" |
|
|
2870 | or die; |
|
|
2871 | |
|
|
2872 | $map->width (50); |
|
|
2873 | $map->height (50); |
|
|
2874 | $map->alloc; |
|
|
2875 | $map->_load_objects ("/tmp/x.map", 1); |
|
|
2876 | my $t = Event::time - $t; |
|
|
2877 | |
|
|
2878 | #next unless $t < 0.0013;#d# |
|
|
2879 | if ($t < $min) { |
|
|
2880 | $min = $t; |
|
|
2881 | } |
|
|
2882 | $avg = $avg * 0.99 + $t * 0.01; |
|
|
2883 | } |
|
|
2884 | warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d# |
|
|
2885 | exit 0; |
|
|
2886 | # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477 |
|
|
2887 | }; |
2846 | |
2888 | |
2847 | $RUNTIME += $TICK; |
2889 | $RUNTIME += $TICK; |
2848 | $NEXT_TICK += $TICK; |
2890 | $NEXT_TICK += $TICK; |
2849 | |
2891 | |
2850 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
2892 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
… | |
… | |
2856 | } |
2898 | } |
2857 | |
2899 | |
2858 | # my $AFTER = Event::time; |
2900 | # my $AFTER = Event::time; |
2859 | # warn $AFTER - $NOW;#d# |
2901 | # warn $AFTER - $NOW;#d# |
2860 | |
2902 | |
|
|
2903 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
|
|
2904 | $sig->send; |
|
|
2905 | } |
|
|
2906 | while (my $sig = shift @WAIT_FOR_TICK) { |
|
|
2907 | $sig->send; |
|
|
2908 | } |
|
|
2909 | |
|
|
2910 | $NOW = Event::time; |
|
|
2911 | |
2861 | # if we are delayed by four ticks or more, skip them all |
2912 | # if we are delayed by four ticks or more, skip them all |
2862 | $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; |
2913 | $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; |
2863 | |
2914 | |
2864 | $TICK_WATCHER->at ($NEXT_TICK); |
2915 | $TICK_WATCHER->at ($NEXT_TICK); |
2865 | $TICK_WATCHER->start; |
2916 | $TICK_WATCHER->start; |
2866 | |
2917 | |
2867 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
2918 | $LOAD = ($NOW - $tick_start) / $TICK; |
2868 | $sig->send; |
2919 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
2869 | } |
|
|
2870 | while (my $sig = shift @WAIT_FOR_TICK) { |
|
|
2871 | $sig->send; |
|
|
2872 | } |
|
|
2873 | |
2920 | |
2874 | _post_tick; |
2921 | _post_tick; |
|
|
2922 | |
|
|
2923 | |
2875 | }, |
2924 | }, |
2876 | ); |
2925 | ); |
2877 | |
2926 | |
2878 | { |
2927 | { |
2879 | BDB::max_poll_time $TICK * 0.1; |
2928 | BDB::max_poll_time $TICK * 0.1; |