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.256 by root, Sat Apr 21 16:56:32 2007 UTC vs.
Revision 1.274 by root, Tue Jun 5 13:05:02 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->()
… …
367 391
368 $coro 392 $coro
369} 393}
370 394
371sub write_runtime { 395sub write_runtime {
396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
372 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
373
374 my $runtime = "$LOCALDIR/runtime";
375 404
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
377 or return; 406 or return;
378 407
379 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
385 414
386 # always fsync - this file is important 415 # always fsync - this file is important
387 aio_fsync $fh 416 aio_fsync $fh
388 and return; 417 and return;
389 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
390 close $fh 422 close $fh
391 or return; 423 or return;
392 424
393 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
394 and return; 426 and return;
427
428 warn "runtime file written.\n";
395 429
396 1 430 1
397} 431}
398 432
399=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
592 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
593 627
594 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 632
599 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 634 my $pkg = shift @arg;
601 635
602 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
643 if (ref $_[0]) { 677 if (ref $_[0]) {
644 _object_attach @_; 678 _object_attach @_;
645 } else { 679 } else {
646 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
647 } 681 }
682 _recalc_want;
648}; 683};
649 684
650# all those should be optimised 685# all those should be optimised
651sub cf::attachable::detach { 686sub cf::attachable::detach {
652 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
655 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
656 reattach ($obj); 691 reattach ($obj);
657 } else { 692 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
659 } 694 }
695 _recalc_want;
660}; 696};
661 697
662sub cf::attachable::attached { 698sub cf::attachable::attached {
663 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
664 700
… …
837 or return; 873 or return;
838 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
839 } 875 }
840 876
841 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
843 return ($data, $av); 879 return ($data, $av);
844} 880}
845 881
846############################################################################# 882#############################################################################
847# command handling &c 883# command handling &c
… …
1535 Coro::cede; 1571 Coro::cede;
1536 $self->activate; 1572 $self->activate;
1537 } 1573 }
1538 1574
1539 $self->in_memory (cf::MAP_IN_MEMORY); 1575 $self->in_memory (cf::MAP_IN_MEMORY);
1540
1541 undef $guard;
1542 } 1576 }
1543 1577
1544 $self->post_load; 1578 $self->post_load;
1545} 1579}
1546 1580
… …
1690 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1724 my $lock = cf::lock_acquire "map_data:$self->{path}";
1691 1725
1692 return if $self->players; 1726 return if $self->players;
1693 return if $self->isa ("ext::map_per_player");#d# 1727 return if $self->isa ("ext::map_per_player");#d#
1694 1728
1695 warn "resetting map ", $self->path;#d# 1729 warn "resetting map ", $self->path;
1696 1730
1697 $self->in_memory (cf::MAP_SWAPPED); 1731 $self->in_memory (cf::MAP_SWAPPED);
1698 1732
1699 # need to save uniques path 1733 # need to save uniques path
1700 unless ($self->{deny_save}) { 1734 unless ($self->{deny_save}) {
… …
1869 $self->deactivate_recursive; 1903 $self->deactivate_recursive;
1870 1904
1871 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1905 return if UNIVERSAL::isa $self->map, "ext::map_link";
1872 1906
1873 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1907 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1874 if $self->map; 1908 if $self->map && $self->map->{path} ne "{link}";
1875 1909
1876 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1910 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1877} 1911}
1878 1912
1879sub cf::object::player::leave_link { 1913sub cf::object::player::leave_link {
1880 my ($self, $map, $x, $y) = @_; 1914 my ($self, $map, $x, $y) = @_;
1915
1916 return unless $self->contr->active;
1881 1917
1882 my $link_pos = delete $self->{_link_pos}; 1918 my $link_pos = delete $self->{_link_pos};
1883 1919
1884 unless ($map) { 1920 unless ($map) {
1885 # restore original map position 1921 # restore original map position
… …
1908 1944
1909 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1910 $self->enter_map ($map, $x, $y); 1946 $self->enter_map ($map, $x, $y);
1911} 1947}
1912 1948
1913cf::player->attach (
1914 on_logout => sub {
1915 my ($pl) = @_;
1916
1917 # abort map switching before logout
1918 if ($pl->ob->{_link_pos}) {
1919 cf::sync_job {
1920 $pl->ob->leave_link
1921 };
1922 }
1923 },
1924 on_login => sub {
1925 my ($pl) = @_;
1926
1927 # try to abort aborted map switching on player login :)
1928 # should happen only on crashes
1929 if ($pl->ob->{_link_pos}) {
1930 $pl->ob->enter_link;
1931 (async {
1932 $pl->ob->reply (undef,
1933 "There was an internal problem at your last logout, "
1934 . "the server will try to bring you to your intended destination in a second.",
1935 cf::NDI_RED);
1936 # we need this sleep as the login has a concurrent enter_exit running
1937 # and this sleep increases chances of the player not ending up in scorn
1938 Coro::Timer::sleep 1;
1939 $pl->ob->leave_link;
1940 })->prio (2);
1941 }
1942 },
1943);
1944
1945=item $player_object->goto ($path, $x, $y) 1949=item $player_object->goto ($path, $x, $y[, $check->($map)])
1946 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
1947=cut 1956=cut
1957
1958our $GOTOGEN;
1948 1959
1949sub cf::object::player::goto { 1960sub cf::object::player::goto {
1950 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;
1951 1965
1952 $self->enter_link; 1966 $self->enter_link;
1953 1967
1954 (async { 1968 (async {
1955 my $map = eval { 1969 my $map = eval {
1956 my $map = cf::map::find $path; 1970 my $map = cf::map::find $path;
1971
1972 if ($map) {
1957 $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
1958 $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 $@;
1959 } or 1985 }
1960 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1961 1986
1987 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation};
1962 $self->leave_link ($map, $x, $y); 1989 $self->leave_link ($map, $x, $y);
1990 }
1963 })->prio (1); 1991 })->prio (1);
1964} 1992}
1965 1993
1966=item $player_object->enter_exit ($exit_object) 1994=item $player_object->enter_exit ($exit_object)
1967 1995
… …
2437 2465
2438 die $$res unless "ARRAY" eq ref $res; 2466 die $$res unless "ARRAY" eq ref $res;
2439 2467
2440 return wantarray ? @$res : $res->[-1]; 2468 return wantarray ? @$res : $res->[-1];
2441 } else { 2469 } else {
2470 reset_signals;
2442 local $SIG{__WARN__}; 2471 local $SIG{__WARN__};
2472 local $SIG{__DIE__};
2443 eval { 2473 eval {
2444 local $SIG{__DIE__};
2445 close $fh1; 2474 close $fh1;
2446 2475
2447 my @res = eval { $cb->(@args) }; 2476 my @res = eval { $cb->(@args) };
2448 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 2477 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2449 }; 2478 };
2450 2479
2451 warn $@ if $@; 2480 warn $@ if $@;
2452 _exit 0; 2481 _exit 0;
2453 } 2482 }
2454} 2483}
2455
2456
2457 2484
2458############################################################################# 2485#############################################################################
2459# the server's init and main functions 2486# the server's init and main functions
2460 2487
2461sub load_facedata($) { 2488sub load_facedata($) {
… …
2533sub reload_resources { 2560sub reload_resources {
2534 warn "reloading resource files...\n"; 2561 warn "reloading resource files...\n";
2535 2562
2536 reload_regions; 2563 reload_regions;
2537 reload_facedata; 2564 reload_facedata;
2565 #reload_archetypes;#d#
2538 reload_archetypes; 2566 reload_archetypes;
2539 reload_treasures; 2567 reload_treasures;
2540 2568
2541 warn "finished reloading resource files\n"; 2569 warn "finished reloading resource files\n";
2542} 2570}
… …
2812 my $signal = new Coro::Signal; 2840 my $signal = new Coro::Signal;
2813 push @WAIT_FOR_TICK_BEGIN, $signal; 2841 push @WAIT_FOR_TICK_BEGIN, $signal;
2814 $signal->wait; 2842 $signal->wait;
2815} 2843}
2816 2844
2845 my $min = 1e6;#d#
2846 my $avg = 10;
2817$TICK_WATCHER = Event->timer ( 2847$TICK_WATCHER = Event->timer (
2818 reentrant => 0, 2848 reentrant => 0,
2819 parked => 1, 2849 parked => 1,
2820 prio => 0, 2850 prio => 0,
2821 at => $NEXT_TICK || $TICK, 2851 at => $NEXT_TICK || $TICK,
… …
2825 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2855 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2826 unless ++$bug_warning > 10; 2856 unless ++$bug_warning > 10;
2827 return; 2857 return;
2828 } 2858 }
2829 2859
2830 $NOW = Event::time; 2860 $NOW = $tick_start = Event::time;
2831 2861
2832 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 };
2833 2886
2834 $RUNTIME += $TICK; 2887 $RUNTIME += $TICK;
2835 $NEXT_TICK += $TICK; 2888 $NEXT_TICK += $TICK;
2836 2889
2837 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2890 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2843 } 2896 }
2844 2897
2845# my $AFTER = Event::time; 2898# my $AFTER = Event::time;
2846# warn $AFTER - $NOW;#d# 2899# warn $AFTER - $NOW;#d#
2847 2900
2901 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2902 $sig->send;
2903 }
2904 while (my $sig = shift @WAIT_FOR_TICK) {
2905 $sig->send;
2906 }
2907
2908 $NOW = Event::time;
2909
2848 # if we are delayed by four ticks or more, skip them all 2910 # if we are delayed by four ticks or more, skip them all
2849 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2911 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2850 2912
2851 $TICK_WATCHER->at ($NEXT_TICK); 2913 $TICK_WATCHER->at ($NEXT_TICK);
2852 $TICK_WATCHER->start; 2914 $TICK_WATCHER->start;
2853 2915
2854 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2916 $LOAD = ($NOW - $tick_start) / $TICK;
2855 $sig->send; 2917 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2856 }
2857 while (my $sig = shift @WAIT_FOR_TICK) {
2858 $sig->send;
2859 }
2860 2918
2861 _post_tick; 2919 _post_tick;
2920
2921
2862 }, 2922 },
2863); 2923);
2864 2924
2865{ 2925{
2866 BDB::max_poll_time $TICK * 0.1; 2926 BDB::max_poll_time $TICK * 0.1;
… …
2925 prio => 6, 2985 prio => 6,
2926 cb => \&IO::AIO::poll_cb, 2986 cb => \&IO::AIO::poll_cb,
2927 ); 2987 );
2928} 2988}
2929 2989
2990my $_log_backtrace;
2991
2992sub _log_backtrace {
2993 my ($msg, @addr) = @_;
2994
2995 $msg =~ s/\n//;
2996
2997 # limit the # of concurrent backtraces
2998 if ($_log_backtrace < 2) {
2999 ++$_log_backtrace;
3000 async {
3001 my @bt = fork_call {
3002 @addr = map { sprintf "%x", $_ } @addr;
3003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3005 or die "addr2line: $!";
3006
3007 my @funcs;
3008 my @res = <$fh>;
3009 chomp for @res;
3010 while (@res) {
3011 my ($func, $line) = splice @res, 0, 2, ();
3012 push @funcs, "[$func] $line";
3013 }
3014
3015 @funcs
3016 };
3017
3018 LOG llevInfo, "[ABT] $msg\n";
3019 LOG llevInfo, "[ABT] $_\n" for @bt;
3020 --$_log_backtrace;
3021 };
3022 } else {
3023 LOG llevInfo, "[ABT] $msg\n";
3024 LOG llevInfo, "[ABT] [suppressed]\n";
3025 }
3026}
3027
2930# load additional modules 3028# load additional modules
2931use cf::pod; 3029use cf::pod;
2932 3030
2933END { cf::emergency_save } 3031END { cf::emergency_save }
2934 3032

Diff Legend

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