… | |
… | |
395 | my $runtime = "$LOCALDIR/runtime"; |
395 | my $runtime = "$LOCALDIR/runtime"; |
396 | |
396 | |
397 | # first touch the runtime file to show we are still running: |
397 | # first touch the runtime file to show we are still running: |
398 | # the fsync below can take a very very long time. |
398 | # the fsync below can take a very very long time. |
399 | |
399 | |
400 | if (my $fh = aio_open $runtime, O_WRONLY, 0) { |
400 | IO::AIO::aio_utime $runtime, undef, undef; |
401 | utime undef, undef, $fh; |
|
|
402 | } |
|
|
403 | |
401 | |
404 | my $guard = cf::lock_acquire "write_runtime"; |
402 | my $guard = cf::lock_acquire "write_runtime"; |
405 | |
403 | |
406 | my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 |
404 | my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 |
407 | or return; |
405 | or return; |
… | |
… | |
416 | # always fsync - this file is important |
414 | # always fsync - this file is important |
417 | aio_fsync $fh |
415 | aio_fsync $fh |
418 | and return; |
416 | and return; |
419 | |
417 | |
420 | # touch it again to show we are up-to-date |
418 | # touch it again to show we are up-to-date |
421 | utime undef, undef, $fh; |
419 | aio_utime $fh, undef, undef; |
422 | |
420 | |
423 | close $fh |
421 | close $fh |
424 | or return; |
422 | or return; |
425 | |
423 | |
426 | aio_rename "$runtime~", $runtime |
424 | aio_rename "$runtime~", $runtime |
… | |
… | |
1904 | $self->deactivate_recursive; |
1902 | $self->deactivate_recursive; |
1905 | |
1903 | |
1906 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1904 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1907 | |
1905 | |
1908 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1906 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1909 | if $self->map; |
1907 | if $self->map && $self->map->{path} ne "{link}"; |
1910 | |
1908 | |
1911 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1909 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1912 | } |
1910 | } |
1913 | |
1911 | |
1914 | sub cf::object::player::leave_link { |
1912 | sub cf::object::player::leave_link { |
1915 | my ($self, $map, $x, $y) = @_; |
1913 | my ($self, $map, $x, $y) = @_; |
|
|
1914 | |
|
|
1915 | return unless $self->contr->active; |
1916 | |
1916 | |
1917 | my $link_pos = delete $self->{_link_pos}; |
1917 | my $link_pos = delete $self->{_link_pos}; |
1918 | |
1918 | |
1919 | unless ($map) { |
1919 | unless ($map) { |
1920 | # restore original map position |
1920 | # restore original map position |
… | |
… | |
1943 | |
1943 | |
1944 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
1944 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
1945 | $self->enter_map ($map, $x, $y); |
1945 | $self->enter_map ($map, $x, $y); |
1946 | } |
1946 | } |
1947 | |
1947 | |
1948 | cf::player->attach ( |
|
|
1949 | on_logout => sub { |
|
|
1950 | my ($pl) = @_; |
|
|
1951 | |
|
|
1952 | # abort map switching before logout |
|
|
1953 | if ($pl->ob->{_link_pos}) { |
|
|
1954 | cf::sync_job { |
|
|
1955 | $pl->ob->leave_link |
|
|
1956 | }; |
|
|
1957 | } |
|
|
1958 | }, |
|
|
1959 | on_login => sub { |
|
|
1960 | my ($pl) = @_; |
|
|
1961 | |
|
|
1962 | # try to abort aborted map switching on player login :) |
|
|
1963 | # should happen only on crashes |
|
|
1964 | if ($pl->ob->{_link_pos}) { |
|
|
1965 | $pl->ob->enter_link; |
|
|
1966 | (async { |
|
|
1967 | $pl->ob->reply (undef, |
|
|
1968 | "There was an internal problem at your last logout, " |
|
|
1969 | . "the server will try to bring you to your intended destination in a second.", |
|
|
1970 | cf::NDI_RED); |
|
|
1971 | # we need this sleep as the login has a concurrent enter_exit running |
|
|
1972 | # and this sleep increases chances of the player not ending up in scorn |
|
|
1973 | Coro::Timer::sleep 1; |
|
|
1974 | $pl->ob->leave_link; |
|
|
1975 | })->prio (2); |
|
|
1976 | } |
|
|
1977 | }, |
|
|
1978 | ); |
|
|
1979 | |
|
|
1980 | =item $player_object->goto ($path, $x, $y) |
1948 | =item $player_object->goto ($path, $x, $y[, $check->($map)]) |
1981 | |
1949 | |
|
|
1950 | Moves the player to the given map-path and coordinates by first freezing |
|
|
1951 | her, loading and preparing them map, calling the provided $check callback |
|
|
1952 | that has to return the map if sucecssful, and then unfreezes the player on |
|
|
1953 | the new (success) or old (failed) map position. |
|
|
1954 | |
1982 | =cut |
1955 | =cut |
|
|
1956 | |
|
|
1957 | our $GOTOGEN; |
1983 | |
1958 | |
1984 | sub cf::object::player::goto { |
1959 | sub cf::object::player::goto { |
1985 | my ($self, $path, $x, $y) = @_; |
1960 | my ($self, $path, $x, $y, $check) = @_; |
|
|
1961 | |
|
|
1962 | # do generation counting so two concurrent goto's will be executed in-order |
|
|
1963 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
1986 | |
1964 | |
1987 | $self->enter_link; |
1965 | $self->enter_link; |
1988 | |
1966 | |
1989 | (async { |
1967 | (async { |
1990 | my $map = eval { |
1968 | my $map = eval { |
1991 | my $map = cf::map::find $path; |
1969 | my $map = cf::map::find $path; |
|
|
1970 | |
|
|
1971 | if ($map) { |
1992 | $map = $map->customise_for ($self) if $map; |
1972 | $map = $map->customise_for ($self); |
|
|
1973 | $map = $check->($map) if $check && $map; |
|
|
1974 | } else { |
|
|
1975 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1976 | } |
|
|
1977 | |
1993 | $map |
1978 | $map |
|
|
1979 | }; |
|
|
1980 | |
|
|
1981 | if ($@) { |
|
|
1982 | $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1983 | LOG llevError | logBacktrace, Carp::longmess $@; |
1994 | } or |
1984 | } |
1995 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1996 | |
1985 | |
|
|
1986 | if ($gen == $self->{_goto_generation}) { |
|
|
1987 | delete $self->{_goto_generation}; |
1997 | $self->leave_link ($map, $x, $y); |
1988 | $self->leave_link ($map, $x, $y); |
|
|
1989 | } |
1998 | })->prio (1); |
1990 | })->prio (1); |
1999 | } |
1991 | } |
2000 | |
1992 | |
2001 | =item $player_object->enter_exit ($exit_object) |
1993 | =item $player_object->enter_exit ($exit_object) |
2002 | |
1994 | |
… | |
… | |
2486 | |
2478 | |
2487 | warn $@ if $@; |
2479 | warn $@ if $@; |
2488 | _exit 0; |
2480 | _exit 0; |
2489 | } |
2481 | } |
2490 | } |
2482 | } |
2491 | |
|
|
2492 | |
|
|
2493 | |
2483 | |
2494 | ############################################################################# |
2484 | ############################################################################# |
2495 | # the server's init and main functions |
2485 | # the server's init and main functions |
2496 | |
2486 | |
2497 | sub load_facedata($) { |
2487 | sub load_facedata($) { |
… | |
… | |
2848 | my $signal = new Coro::Signal; |
2838 | my $signal = new Coro::Signal; |
2849 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2839 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2850 | $signal->wait; |
2840 | $signal->wait; |
2851 | } |
2841 | } |
2852 | |
2842 | |
|
|
2843 | my $min = 1e6;#d# |
|
|
2844 | my $avg = 10; |
2853 | $TICK_WATCHER = Event->timer ( |
2845 | $TICK_WATCHER = Event->timer ( |
2854 | reentrant => 0, |
2846 | reentrant => 0, |
2855 | parked => 1, |
2847 | parked => 1, |
2856 | prio => 0, |
2848 | prio => 0, |
2857 | at => $NEXT_TICK || $TICK, |
2849 | at => $NEXT_TICK || $TICK, |
… | |
… | |
2864 | } |
2856 | } |
2865 | |
2857 | |
2866 | $NOW = $tick_start = Event::time; |
2858 | $NOW = $tick_start = Event::time; |
2867 | |
2859 | |
2868 | cf::server_tick; # one server iteration |
2860 | cf::server_tick; # one server iteration |
|
|
2861 | |
|
|
2862 | 0 && sync_job {#d# |
|
|
2863 | for(1..10) { |
|
|
2864 | my $t = Event::time; |
|
|
2865 | my $map = my $map = new_from_path cf::map "/tmp/x.map" |
|
|
2866 | or die; |
|
|
2867 | |
|
|
2868 | $map->width (50); |
|
|
2869 | $map->height (50); |
|
|
2870 | $map->alloc; |
|
|
2871 | $map->_load_objects ("/tmp/x.map", 1); |
|
|
2872 | my $t = Event::time - $t; |
|
|
2873 | |
|
|
2874 | #next unless $t < 0.0013;#d# |
|
|
2875 | if ($t < $min) { |
|
|
2876 | $min = $t; |
|
|
2877 | } |
|
|
2878 | $avg = $avg * 0.99 + $t * 0.01; |
|
|
2879 | } |
|
|
2880 | warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d# |
|
|
2881 | exit 0; |
|
|
2882 | # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477 |
|
|
2883 | }; |
2869 | |
2884 | |
2870 | $RUNTIME += $TICK; |
2885 | $RUNTIME += $TICK; |
2871 | $NEXT_TICK += $TICK; |
2886 | $NEXT_TICK += $TICK; |
2872 | |
2887 | |
2873 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
2888 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |