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.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.274 by root, Tue Jun 5 13:05:02 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
427 and return; 426 and return;
428 427
429 warn "runtime file written.\n";#d# 428 warn "runtime file written.\n";
430 429
431 1 430 1
432} 431}
433 432
434=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
874 or return; 873 or return;
875 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
876 } 875 }
877 876
878 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
880 return ($data, $av); 879 return ($data, $av);
881} 880}
882 881
883############################################################################# 882#############################################################################
884# command handling &c 883# command handling &c
… …
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1724 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 1725
1727 return if $self->players; 1726 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d# 1727 return if $self->isa ("ext::map_per_player");#d#
1729 1728
1730 warn "resetting map ", $self->path;#d# 1729 warn "resetting map ", $self->path;
1731 1730
1732 $self->in_memory (cf::MAP_SWAPPED); 1731 $self->in_memory (cf::MAP_SWAPPED);
1733 1732
1734 # need to save uniques path 1733 # need to save uniques path
1735 unless ($self->{deny_save}) { 1734 unless ($self->{deny_save}) {
… …
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) 1949=item $player_object->goto ($path, $x, $y[, $check->($map)])
1981 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
1982=cut 1956=cut
1957
1958our $GOTOGEN;
1983 1959
1984sub cf::object::player::goto { 1960sub cf::object::player::goto {
1985 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;
1986 1965
1987 $self->enter_link; 1966 $self->enter_link;
1988 1967
1989 (async { 1968 (async {
1990 my $map = eval { 1969 my $map = eval {
1991 my $map = cf::map::find $path; 1970 my $map = cf::map::find $path;
1971
1972 if ($map) {
1992 $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
1993 $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 $@;
1994 } or 1985 }
1995 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1996 1986
1987 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation};
1997 $self->leave_link ($map, $x, $y); 1989 $self->leave_link ($map, $x, $y);
1990 }
1998 })->prio (1); 1991 })->prio (1);
1999} 1992}
2000 1993
2001=item $player_object->enter_exit ($exit_object) 1994=item $player_object->enter_exit ($exit_object)
2002 1995
… …
2487 warn $@ if $@; 2480 warn $@ if $@;
2488 _exit 0; 2481 _exit 0;
2489 } 2482 }
2490} 2483}
2491 2484
2492
2493
2494############################################################################# 2485#############################################################################
2495# the server's init and main functions 2486# the server's init and main functions
2496 2487
2497sub load_facedata($) { 2488sub load_facedata($) {
2498 my ($path) = @_; 2489 my ($path) = @_;
… …
2569sub reload_resources { 2560sub reload_resources {
2570 warn "reloading resource files...\n"; 2561 warn "reloading resource files...\n";
2571 2562
2572 reload_regions; 2563 reload_regions;
2573 reload_facedata; 2564 reload_facedata;
2565 #reload_archetypes;#d#
2574 reload_archetypes; 2566 reload_archetypes;
2575 reload_treasures; 2567 reload_treasures;
2576 2568
2577 warn "finished reloading resource files\n"; 2569 warn "finished reloading resource files\n";
2578} 2570}
… …
2848 my $signal = new Coro::Signal; 2840 my $signal = new Coro::Signal;
2849 push @WAIT_FOR_TICK_BEGIN, $signal; 2841 push @WAIT_FOR_TICK_BEGIN, $signal;
2850 $signal->wait; 2842 $signal->wait;
2851} 2843}
2852 2844
2845 my $min = 1e6;#d#
2846 my $avg = 10;
2853$TICK_WATCHER = Event->timer ( 2847$TICK_WATCHER = Event->timer (
2854 reentrant => 0, 2848 reentrant => 0,
2855 parked => 1, 2849 parked => 1,
2856 prio => 0, 2850 prio => 0,
2857 at => $NEXT_TICK || $TICK, 2851 at => $NEXT_TICK || $TICK,
… …
2864 } 2858 }
2865 2859
2866 $NOW = $tick_start = Event::time; 2860 $NOW = $tick_start = Event::time;
2867 2861
2868 cf::server_tick; # one server iteration 2862 cf::server_tick; # one server iteration
2863
2864 0 && sync_job {#d#
2865 for(1..10) {
2866 my $t = Event::time;
2867 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2868 or die;
2869
2870 $map->width (50);
2871 $map->height (50);
2872 $map->alloc;
2873 $map->_load_objects ("/tmp/x.map", 1);
2874 my $t = Event::time - $t;
2875
2876 #next unless $t < 0.0013;#d#
2877 if ($t < $min) {
2878 $min = $t;
2879 }
2880 $avg = $avg * 0.99 + $t * 0.01;
2881 }
2882 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2883 exit 0;
2884 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2885 };
2869 2886
2870 $RUNTIME += $TICK; 2887 $RUNTIME += $TICK;
2871 $NEXT_TICK += $TICK; 2888 $NEXT_TICK += $TICK;
2872 2889
2873 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2890 if ($NOW >= $NEXT_RUNTIME_WRITE) {

Diff Legend

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