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.269 by root, Tue May 22 21:35:26 2007 UTC vs.
Revision 1.273 by root, Mon Jun 4 12:19:08 2007 UTC

… …
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@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';
192@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)
193 194
194# 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
195# within the Safe compartment. 196# within the Safe compartment.
196for my $pkg (qw( 197for my $pkg (qw(
197 cf::global cf::attachable 198 cf::global cf::attachable
… …
395 my $runtime = "$LOCALDIR/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
396 397
397 # first touch the runtime file to show we are still running: 398 # first touch the runtime file to show we are still running:
398 # the fsync below can take a very very long time. 399 # the fsync below can take a very very long time.
399 400
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 401 IO::AIO::aio_utime $runtime, undef, undef;
401 utime undef, undef, $fh;
402 }
403 402
404 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
405 404
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
407 or return; 406 or return;
… …
416 # always fsync - this file is important 415 # always fsync - this file is important
417 aio_fsync $fh 416 aio_fsync $fh
418 and return; 417 and return;
419 418
420 # touch it again to show we are up-to-date 419 # touch it again to show we are up-to-date
421 utime undef, undef, $fh; 420 aio_utime $fh, undef, undef;
422 421
423 close $fh 422 close $fh
424 or return; 423 or return;
425 424
426 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
… …
1904 $self->deactivate_recursive; 1903 $self->deactivate_recursive;
1905 1904
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1905 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 1906
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1907 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 1908 if $self->map && $self->map->{path} ne "{link}";
1910 1909
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1910 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 1911}
1913 1912
1914sub cf::object::player::leave_link { 1913sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 1914 my ($self, $map, $x, $y) = @_;
1915
1916 return unless $self->contr->active;
1916 1917
1917 my $link_pos = delete $self->{_link_pos}; 1918 my $link_pos = delete $self->{_link_pos};
1918 1919
1919 unless ($map) { 1920 unless ($map) {
1920 # restore original map position 1921 # restore original map position
… …
1943 1944
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 1946 $self->enter_map ($map, $x, $y);
1946} 1947}
1947 1948
1948cf::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[, $check->($map)]) 1949=item $player_object->goto ($path, $x, $y[, $check->($map)])
1981 1950
1982Moves the player to the given map-path and coordinates by first freezing 1951Moves the player to the given map-path and coordinates by first freezing
1983her, loading and preparing them map, calling the provided $check callback 1952her, loading and preparing them map, calling the provided $check callback
1984that has to return the map if sucecssful, and then unfreezes the player on 1953that has to return the map if sucecssful, and then unfreezes the player on
1985the new (success) or old (failed) map position. 1954the new (success) or old (failed) map position.
1986 1955
1987=cut 1956=cut
1988 1957
1958our $GOTOGEN;
1959
1989sub cf::object::player::goto { 1960sub cf::object::player::goto {
1990 my ($self, $path, $x, $y, $check) = @_; 1961 my ($self, $path, $x, $y, $check) = @_;
1962
1963 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1991 1965
1992 $self->enter_link; 1966 $self->enter_link;
1993 1967
1994 (async { 1968 (async {
1995 my $map = eval { 1969 my $map = eval {
… …
2008 if ($@) { 1982 if ($@) {
2009 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED); 1983 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2010 LOG llevError | logBacktrace, Carp::longmess $@; 1984 LOG llevError | logBacktrace, Carp::longmess $@;
2011 } 1985 }
2012 1986
1987 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation};
2013 $self->leave_link ($map, $x, $y); 1989 $self->leave_link ($map, $x, $y);
1990 }
2014 })->prio (1); 1991 })->prio (1);
2015} 1992}
2016 1993
2017=item $player_object->enter_exit ($exit_object) 1994=item $player_object->enter_exit ($exit_object)
2018 1995
… …
2502 2479
2503 warn $@ if $@; 2480 warn $@ if $@;
2504 _exit 0; 2481 _exit 0;
2505 } 2482 }
2506} 2483}
2507
2508
2509 2484
2510############################################################################# 2485#############################################################################
2511# the server's init and main functions 2486# the server's init and main functions
2512 2487
2513sub load_facedata($) { 2488sub load_facedata($) {

Diff Legend

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