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.264 by root, Sun May 6 05:44:48 2007 UTC vs.
Revision 1.273 by root, Mon Jun 4 12:19:08 2007 UTC

… …
90our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
91 91
92# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
95binmode STDOUT; 99binmode STDOUT;
96binmode STDERR; 100binmode STDERR;
97 101
98# read virtual server time, if available 102# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
… …
139 143
140=item $cf::TICK 144=item $cf::TICK
141 145
142The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
143 147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
157
144=item %cf::CFG 158=item %cf::CFG
145 159
146Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 161from wherever your confdir points to.
148 162
… …
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@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';
178@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)
179 194
180# 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
181# within the Safe compartment. 196# within the Safe compartment.
182for my $pkg (qw( 197for my $pkg (qw(
183 cf::global cf::attachable 198 cf::global cf::attachable
… …
318 333
319sub sync_job(&) { 334sub sync_job(&) {
320 my ($job) = @_; 335 my ($job) = @_;
321 336
322 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
323 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
325 342
326 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
338 355
339 while ($busy) { 356 while ($busy) {
340 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
341 } 358 }
342 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
343 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
344 } else { 368 } else {
345 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
346 370
347 $job->() 371 $job->()
… …
372 my $runtime = "$LOCALDIR/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
373 397
374 # first touch the runtime file to show we are still running: 398 # first touch the runtime file to show we are still running:
375 # the fsync below can take a very very long time. 399 # the fsync below can take a very very long time.
376 400
377 warn "touching runtime...\n";#d# 401 IO::AIO::aio_utime $runtime, undef, undef;
378 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
379 utime undef, undef, $fh;
380 }
381 402
382 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
383 404
384 warn "starting to write runtime...\n";#d#
385 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
386 or return; 406 or return;
387 407
388 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
389 # 10 is the runtime save interval, for a monotonic clock 409 # 10 is the runtime save interval, for a monotonic clock
… …
395 # always fsync - this file is important 415 # always fsync - this file is important
396 aio_fsync $fh 416 aio_fsync $fh
397 and return; 417 and return;
398 418
399 # touch it again to show we are up-to-date 419 # touch it again to show we are up-to-date
400 utime undef, undef, $fh; 420 aio_utime $fh, undef, undef;
401 421
402 close $fh 422 close $fh
403 or return; 423 or return;
404 424
405 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
406 and return; 426 and return;
407 427
408 warn "... done writing runtime.\n";#d# 428 warn "runtime file written.\n";#d#
409 429
410 1 430 1
411} 431}
412 432
413=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
606 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
607 627
608 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
609 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
610 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
611 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
612 632
613 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
614 my $pkg = shift @arg; 634 my $pkg = shift @arg;
615 635
616 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
657 if (ref $_[0]) { 677 if (ref $_[0]) {
658 _object_attach @_; 678 _object_attach @_;
659 } else { 679 } else {
660 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
661 } 681 }
682 _recalc_want;
662}; 683};
663 684
664# all those should be optimised 685# all those should be optimised
665sub cf::attachable::detach { 686sub cf::attachable::detach {
666 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
669 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
670 reattach ($obj); 691 reattach ($obj);
671 } else { 692 } else {
672 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
673 } 694 }
695 _recalc_want;
674}; 696};
675 697
676sub cf::attachable::attached { 698sub cf::attachable::attached {
677 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
678 700
… …
1881 $self->deactivate_recursive; 1903 $self->deactivate_recursive;
1882 1904
1883 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1905 return if UNIVERSAL::isa $self->map, "ext::map_link";
1884 1906
1885 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1907 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1886 if $self->map; 1908 if $self->map && $self->map->{path} ne "{link}";
1887 1909
1888 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1910 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1889} 1911}
1890 1912
1891sub cf::object::player::leave_link { 1913sub cf::object::player::leave_link {
1892 my ($self, $map, $x, $y) = @_; 1914 my ($self, $map, $x, $y) = @_;
1915
1916 return unless $self->contr->active;
1893 1917
1894 my $link_pos = delete $self->{_link_pos}; 1918 my $link_pos = delete $self->{_link_pos};
1895 1919
1896 unless ($map) { 1920 unless ($map) {
1897 # restore original map position 1921 # restore original map position
… …
1920 1944
1921 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1922 $self->enter_map ($map, $x, $y); 1946 $self->enter_map ($map, $x, $y);
1923} 1947}
1924 1948
1925cf::player->attach (
1926 on_logout => sub {
1927 my ($pl) = @_;
1928
1929 # abort map switching before logout
1930 if ($pl->ob->{_link_pos}) {
1931 cf::sync_job {
1932 $pl->ob->leave_link
1933 };
1934 }
1935 },
1936 on_login => sub {
1937 my ($pl) = @_;
1938
1939 # try to abort aborted map switching on player login :)
1940 # should happen only on crashes
1941 if ($pl->ob->{_link_pos}) {
1942 $pl->ob->enter_link;
1943 (async {
1944 $pl->ob->reply (undef,
1945 "There was an internal problem at your last logout, "
1946 . "the server will try to bring you to your intended destination in a second.",
1947 cf::NDI_RED);
1948 # we need this sleep as the login has a concurrent enter_exit running
1949 # and this sleep increases chances of the player not ending up in scorn
1950 Coro::Timer::sleep 1;
1951 $pl->ob->leave_link;
1952 })->prio (2);
1953 }
1954 },
1955);
1956
1957=item $player_object->goto ($path, $x, $y) 1949=item $player_object->goto ($path, $x, $y[, $check->($map)])
1958 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
1959=cut 1956=cut
1957
1958our $GOTOGEN;
1960 1959
1961sub cf::object::player::goto { 1960sub cf::object::player::goto {
1962 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;
1963 1965
1964 $self->enter_link; 1966 $self->enter_link;
1965 1967
1966 (async { 1968 (async {
1967 my $map = eval { 1969 my $map = eval {
1968 my $map = cf::map::find $path; 1970 my $map = cf::map::find $path;
1971
1972 if ($map) {
1969 $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
1970 $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 $@;
1971 } or 1985 }
1972 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1973 1986
1987 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation};
1974 $self->leave_link ($map, $x, $y); 1989 $self->leave_link ($map, $x, $y);
1990 }
1975 })->prio (1); 1991 })->prio (1);
1976} 1992}
1977 1993
1978=item $player_object->enter_exit ($exit_object) 1994=item $player_object->enter_exit ($exit_object)
1979 1995
… …
2463 2479
2464 warn $@ if $@; 2480 warn $@ if $@;
2465 _exit 0; 2481 _exit 0;
2466 } 2482 }
2467} 2483}
2468
2469
2470 2484
2471############################################################################# 2485#############################################################################
2472# the server's init and main functions 2486# the server's init and main functions
2473 2487
2474sub load_facedata($) { 2488sub load_facedata($) {
… …
2825 my $signal = new Coro::Signal; 2839 my $signal = new Coro::Signal;
2826 push @WAIT_FOR_TICK_BEGIN, $signal; 2840 push @WAIT_FOR_TICK_BEGIN, $signal;
2827 $signal->wait; 2841 $signal->wait;
2828} 2842}
2829 2843
2844 my $min = 1e6;#d#
2845 my $avg = 10;
2830$TICK_WATCHER = Event->timer ( 2846$TICK_WATCHER = Event->timer (
2831 reentrant => 0, 2847 reentrant => 0,
2832 parked => 1, 2848 parked => 1,
2833 prio => 0, 2849 prio => 0,
2834 at => $NEXT_TICK || $TICK, 2850 at => $NEXT_TICK || $TICK,
… …
2838 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2854 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2839 unless ++$bug_warning > 10; 2855 unless ++$bug_warning > 10;
2840 return; 2856 return;
2841 } 2857 }
2842 2858
2843 $NOW = Event::time; 2859 $NOW = $tick_start = Event::time;
2844 2860
2845 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 };
2846 2885
2847 $RUNTIME += $TICK; 2886 $RUNTIME += $TICK;
2848 $NEXT_TICK += $TICK; 2887 $NEXT_TICK += $TICK;
2849 2888
2850 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2889 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2856 } 2895 }
2857 2896
2858# my $AFTER = Event::time; 2897# my $AFTER = Event::time;
2859# warn $AFTER - $NOW;#d# 2898# warn $AFTER - $NOW;#d#
2860 2899
2900 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2901 $sig->send;
2902 }
2903 while (my $sig = shift @WAIT_FOR_TICK) {
2904 $sig->send;
2905 }
2906
2907 $NOW = Event::time;
2908
2861 # if we are delayed by four ticks or more, skip them all 2909 # if we are delayed by four ticks or more, skip them all
2862 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2910 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2863 2911
2864 $TICK_WATCHER->at ($NEXT_TICK); 2912 $TICK_WATCHER->at ($NEXT_TICK);
2865 $TICK_WATCHER->start; 2913 $TICK_WATCHER->start;
2866 2914
2867 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2915 $LOAD = ($NOW - $tick_start) / $TICK;
2868 $sig->send; 2916 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2869 }
2870 while (my $sig = shift @WAIT_FOR_TICK) {
2871 $sig->send;
2872 }
2873 2917
2874 _post_tick; 2918 _post_tick;
2919
2920
2875 }, 2921 },
2876); 2922);
2877 2923
2878{ 2924{
2879 BDB::max_poll_time $TICK * 0.1; 2925 BDB::max_poll_time $TICK * 0.1;

Diff Legend

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