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.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
… …
627 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
628 627
629 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
630 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
631 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
632 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
633 632
634 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
635 my $pkg = shift @arg; 634 my $pkg = shift @arg;
636 635
637 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
678 if (ref $_[0]) { 677 if (ref $_[0]) {
679 _object_attach @_; 678 _object_attach @_;
680 } else { 679 } else {
681 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
682 } 681 }
682 _recalc_want;
683}; 683};
684 684
685# all those should be optimised 685# all those should be optimised
686sub cf::attachable::detach { 686sub cf::attachable::detach {
687 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
690 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
691 reattach ($obj); 691 reattach ($obj);
692 } else { 692 } else {
693 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
694 } 694 }
695 _recalc_want;
695}; 696};
696 697
697sub cf::attachable::attached { 698sub cf::attachable::attached {
698 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
699 700
… …
1902 $self->deactivate_recursive; 1903 $self->deactivate_recursive;
1903 1904
1904 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1905 return if UNIVERSAL::isa $self->map, "ext::map_link";
1905 1906
1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1907 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1907 if $self->map; 1908 if $self->map && $self->map->{path} ne "{link}";
1908 1909
1909 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1910 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1910} 1911}
1911 1912
1912sub cf::object::player::leave_link { 1913sub cf::object::player::leave_link {
1913 my ($self, $map, $x, $y) = @_; 1914 my ($self, $map, $x, $y) = @_;
1915
1916 return unless $self->contr->active;
1914 1917
1915 my $link_pos = delete $self->{_link_pos}; 1918 my $link_pos = delete $self->{_link_pos};
1916 1919
1917 unless ($map) { 1920 unless ($map) {
1918 # restore original map position 1921 # restore original map position
… …
1941 1944
1942 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1943 $self->enter_map ($map, $x, $y); 1946 $self->enter_map ($map, $x, $y);
1944} 1947}
1945 1948
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) 1949=item $player_object->goto ($path, $x, $y[, $check->($map)])
1979 1950
1951Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position.
1955
1980=cut 1956=cut
1957
1958our $GOTOGEN;
1981 1959
1982sub cf::object::player::goto { 1960sub cf::object::player::goto {
1983 my ($self, $path, $x, $y) = @_; 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;
1984 1965
1985 $self->enter_link; 1966 $self->enter_link;
1986 1967
1987 (async { 1968 (async {
1988 my $map = eval { 1969 my $map = eval {
1989 my $map = cf::map::find $path; 1970 my $map = cf::map::find $path;
1971
1972 if ($map) {
1990 $map = $map->customise_for ($self) if $map; 1973 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map;
1975 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1977 }
1978
1991 $map 1979 $map
1980 };
1981
1982 if ($@) {
1983 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1984 LOG llevError | logBacktrace, Carp::longmess $@;
1992 } or 1985 }
1993 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1994 1986
1987 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation};
1995 $self->leave_link ($map, $x, $y); 1989 $self->leave_link ($map, $x, $y);
1990 }
1996 })->prio (1); 1991 })->prio (1);
1997} 1992}
1998 1993
1999=item $player_object->enter_exit ($exit_object) 1994=item $player_object->enter_exit ($exit_object)
2000 1995
… …
2484 2479
2485 warn $@ if $@; 2480 warn $@ if $@;
2486 _exit 0; 2481 _exit 0;
2487 } 2482 }
2488} 2483}
2489
2490
2491 2484
2492############################################################################# 2485#############################################################################
2493# the server's init and main functions 2486# the server's init and main functions
2494 2487
2495sub load_facedata($) { 2488sub load_facedata($) {
… …
2846 my $signal = new Coro::Signal; 2839 my $signal = new Coro::Signal;
2847 push @WAIT_FOR_TICK_BEGIN, $signal; 2840 push @WAIT_FOR_TICK_BEGIN, $signal;
2848 $signal->wait; 2841 $signal->wait;
2849} 2842}
2850 2843
2844 my $min = 1e6;#d#
2845 my $avg = 10;
2851$TICK_WATCHER = Event->timer ( 2846$TICK_WATCHER = Event->timer (
2852 reentrant => 0, 2847 reentrant => 0,
2853 parked => 1, 2848 parked => 1,
2854 prio => 0, 2849 prio => 0,
2855 at => $NEXT_TICK || $TICK, 2850 at => $NEXT_TICK || $TICK,
… …
2862 } 2857 }
2863 2858
2864 $NOW = $tick_start = Event::time; 2859 $NOW = $tick_start = Event::time;
2865 2860
2866 cf::server_tick; # one server iteration 2861 cf::server_tick; # one server iteration
2862
2863 0 && sync_job {#d#
2864 for(1..10) {
2865 my $t = Event::time;
2866 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2867 or die;
2868
2869 $map->width (50);
2870 $map->height (50);
2871 $map->alloc;
2872 $map->_load_objects ("/tmp/x.map", 1);
2873 my $t = Event::time - $t;
2874
2875 #next unless $t < 0.0013;#d#
2876 if ($t < $min) {
2877 $min = $t;
2878 }
2879 $avg = $avg * 0.99 + $t * 0.01;
2880 }
2881 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2882 exit 0;
2883 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2884 };
2867 2885
2868 $RUNTIME += $TICK; 2886 $RUNTIME += $TICK;
2869 $NEXT_TICK += $TICK; 2887 $NEXT_TICK += $TICK;
2870 2888
2871 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2889 if ($NOW >= $NEXT_RUNTIME_WRITE) {

Diff Legend

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