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.266 by root, Fri May 18 01:01:02 2007 UTC vs.
Revision 1.271 by root, Fri Jun 1 06:04:08 2007 UTC

… …
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
… …
627 $registry = $CB_TYPE[$object_type] ||= []; 625 $registry = $CB_TYPE[$object_type] ||= [];
628 626
629 } elsif ($type eq "subtype") { 627 } elsif ($type eq "subtype") {
630 defined $object_type or Carp::croak "subtype specified without type"; 628 defined $object_type or Carp::croak "subtype specified without type";
631 my $object_subtype = shift @arg; 629 my $object_subtype = shift @arg;
632 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 630 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
633 631
634 } elsif ($type eq "package") { 632 } elsif ($type eq "package") {
635 my $pkg = shift @arg; 633 my $pkg = shift @arg;
636 634
637 while (my ($name, $id) = each %cb_id) { 635 while (my ($name, $id) = each %cb_id) {
… …
678 if (ref $_[0]) { 676 if (ref $_[0]) {
679 _object_attach @_; 677 _object_attach @_;
680 } else { 678 } else {
681 _attach shift->_attach_registry, @_; 679 _attach shift->_attach_registry, @_;
682 } 680 }
681 _recalc_want;
683}; 682};
684 683
685# all those should be optimised 684# all those should be optimised
686sub cf::attachable::detach { 685sub cf::attachable::detach {
687 my ($obj, $name) = @_; 686 my ($obj, $name) = @_;
… …
690 delete $obj->{_attachment}{$name}; 689 delete $obj->{_attachment}{$name};
691 reattach ($obj); 690 reattach ($obj);
692 } else { 691 } else {
693 Carp::croak "cannot, currently, detach class attachments"; 692 Carp::croak "cannot, currently, detach class attachments";
694 } 693 }
694 _recalc_want;
695}; 695};
696 696
697sub cf::attachable::attached { 697sub cf::attachable::attached {
698 my ($obj, $name) = @_; 698 my ($obj, $name) = @_;
699 699
… …
1902 $self->deactivate_recursive; 1902 $self->deactivate_recursive;
1903 1903
1904 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1904 return if UNIVERSAL::isa $self->map, "ext::map_link";
1905 1905
1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1907 if $self->map; 1907 if $self->map && $self->map->{path} ne "{link}";
1908 1908
1909 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1909 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1910} 1910}
1911 1911
1912sub cf::object::player::leave_link { 1912sub cf::object::player::leave_link {
1913 my ($self, $map, $x, $y) = @_; 1913 my ($self, $map, $x, $y) = @_;
1914
1915 return unless $self->contr->active;
1914 1916
1915 my $link_pos = delete $self->{_link_pos}; 1917 my $link_pos = delete $self->{_link_pos};
1916 1918
1917 unless ($map) { 1919 unless ($map) {
1918 # restore original map position 1920 # restore original map position
… …
1941 1943
1942 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1943 $self->enter_map ($map, $x, $y); 1945 $self->enter_map ($map, $x, $y);
1944} 1946}
1945 1947
1946cf::player->attach (
1947 on_logout => sub {
1948 my ($pl) = @_;
1949
1950 # abort map switching before logout
1951 if ($pl->ob->{_link_pos}) {
1952 cf::sync_job {
1953 $pl->ob->leave_link
1954 };
1955 }
1956 },
1957 on_login => sub {
1958 my ($pl) = @_;
1959
1960 # try to abort aborted map switching on player login :)
1961 # should happen only on crashes
1962 if ($pl->ob->{_link_pos}) {
1963 $pl->ob->enter_link;
1964 (async {
1965 $pl->ob->reply (undef,
1966 "There was an internal problem at your last logout, "
1967 . "the server will try to bring you to your intended destination in a second.",
1968 cf::NDI_RED);
1969 # we need this sleep as the login has a concurrent enter_exit running
1970 # and this sleep increases chances of the player not ending up in scorn
1971 Coro::Timer::sleep 1;
1972 $pl->ob->leave_link;
1973 })->prio (2);
1974 }
1975 },
1976);
1977
1978=item $player_object->goto ($path, $x, $y) 1948=item $player_object->goto ($path, $x, $y[, $check->($map)])
1979 1949
1950Moves the player to the given map-path and coordinates by first freezing
1951her, loading and preparing them map, calling the provided $check callback
1952that has to return the map if sucecssful, and then unfreezes the player on
1953the new (success) or old (failed) map position.
1954
1980=cut 1955=cut
1956
1957our $GOTOGEN;
1981 1958
1982sub cf::object::player::goto { 1959sub cf::object::player::goto {
1983 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;
1984 1964
1985 $self->enter_link; 1965 $self->enter_link;
1986 1966
1987 (async { 1967 (async {
1988 my $map = eval { 1968 my $map = eval {
1989 my $map = cf::map::find $path; 1969 my $map = cf::map::find $path;
1970
1971 if ($map) {
1990 $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
1991 $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 $@;
1992 } or 1984 }
1993 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1994 1985
1986 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation};
1995 $self->leave_link ($map, $x, $y); 1988 $self->leave_link ($map, $x, $y);
1989 }
1996 })->prio (1); 1990 })->prio (1);
1997} 1991}
1998 1992
1999=item $player_object->enter_exit ($exit_object) 1993=item $player_object->enter_exit ($exit_object)
2000 1994
… …
2484 2478
2485 warn $@ if $@; 2479 warn $@ if $@;
2486 _exit 0; 2480 _exit 0;
2487 } 2481 }
2488} 2482}
2489
2490
2491 2483
2492############################################################################# 2484#############################################################################
2493# the server's init and main functions 2485# the server's init and main functions
2494 2486
2495sub load_facedata($) { 2487sub load_facedata($) {
… …
2846 my $signal = new Coro::Signal; 2838 my $signal = new Coro::Signal;
2847 push @WAIT_FOR_TICK_BEGIN, $signal; 2839 push @WAIT_FOR_TICK_BEGIN, $signal;
2848 $signal->wait; 2840 $signal->wait;
2849} 2841}
2850 2842
2843 my $min = 1e6;#d#
2844 my $avg = 10;
2851$TICK_WATCHER = Event->timer ( 2845$TICK_WATCHER = Event->timer (
2852 reentrant => 0, 2846 reentrant => 0,
2853 parked => 1, 2847 parked => 1,
2854 prio => 0, 2848 prio => 0,
2855 at => $NEXT_TICK || $TICK, 2849 at => $NEXT_TICK || $TICK,
… …
2862 } 2856 }
2863 2857
2864 $NOW = $tick_start = Event::time; 2858 $NOW = $tick_start = Event::time;
2865 2859
2866 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 };
2867 2884
2868 $RUNTIME += $TICK; 2885 $RUNTIME += $TICK;
2869 $NEXT_TICK += $TICK; 2886 $NEXT_TICK += $TICK;
2870 2887
2871 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2888 if ($NOW >= $NEXT_RUNTIME_WRITE) {

Diff Legend

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