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.254 by root, Thu Apr 19 11:12:45 2007 UTC vs.
Revision 1.275 by root, Thu Jun 7 19:12:22 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
… …
161 my $msg = join "", @_; 175 my $msg = join "", @_;
162 176
163 $msg .= "\n" 177 $msg .= "\n"
164 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
165 179
166 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167 181
168 utf8::encode $msg; 182 utf8::encode $msg;
169 LOG llevError, $msg; 183 LOG llevError, $msg;
170 }; 184 };
171} 185}
… …
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
… …
1269 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1270 1306
1271 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1272 local $self->{path}; 1308 local $self->{path};
1273 local $self->{load_path}; 1309 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1310
1277 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1278} 1312}
1279 1313
1280sub normalise { 1314sub normalise {
… …
1380 1414
1381 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1383} 1417}
1384 1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1425}
1426
1385sub unlink_save { 1427sub unlink_save {
1386 my ($self) = @_; 1428 my ($self) = @_;
1387 1429
1388 utf8::encode (my $save = $self->save_path); 1430 utf8::encode (my $save = $self->save_path);
1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1431 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1445 $self->load_header_orig 1487 $self->load_header_orig
1446 or return; 1488 or return;
1447 $self->prepare_orig; 1489 $self->prepare_orig;
1448 } 1490 }
1449 1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1495 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1496 unless $self->default_region;
1452 1497
1453 1 1498 1
1454} 1499}
… …
1469 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1470 1515
1471 $map->load_header 1516 $map->load_header
1472 or return; 1517 or return;
1473 1518
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1522 $map->reset;
1478 undef $guard; 1523 undef $guard;
1479 return find $path; 1524 return find $path;
… …
1490 my ($self) = @_; 1535 my ($self) = @_;
1491 1536
1492 local $self->{deny_reset} = 1; # loading can take a long time 1537 local $self->{deny_reset} = 1; # loading can take a long time
1493 1538
1494 my $path = $self->{path}; 1539 my $path = $self->{path};
1540
1541 {
1495 my $guard = cf::lock_acquire "map_load:$path"; 1542 my $guard = cf::lock_acquire "map_load:$path";
1496 1543
1497 return if $self->in_memory != cf::MAP_SWAPPED; 1544 return if $self->in_memory != cf::MAP_SWAPPED;
1498 1545
1499 $self->in_memory (cf::MAP_LOADING); 1546 $self->in_memory (cf::MAP_LOADING);
1500 1547
1501 $self->alloc; 1548 $self->alloc;
1502 1549
1503 $self->pre_load; 1550 $self->pre_load;
1504 Coro::cede;
1505
1506 $self->_load_objects ($self->{load_path}, 1)
1507 or return;
1508
1509 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1510 if delete $self->{load_original};
1511
1512 if (my $uniq = $self->uniq_path) {
1513 utf8::encode $uniq;
1514 if (aio_open $uniq, O_RDONLY, 0) {
1515 $self->clear_unique_items;
1516 $self->_load_objects ($uniq, 0);
1517 }
1518 }
1519
1520 Coro::cede;
1521 # now do the right thing for maps
1522 $self->link_multipart_objects;
1523 Coro::cede;
1524
1525 unless ($self->{deny_activate}) {
1526 $self->decay_objects;
1527 $self->fix_auto_apply;
1528 $self->update_buttons;
1529 Coro::cede; 1551 Coro::cede;
1530 $self->set_darkness_map; 1552
1553 $self->_load_objects ($self->{load_path}, 1)
1554 or return;
1555
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original};
1558
1559 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) {
1562 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0);
1564 }
1565 }
1566
1567 Coro::cede;
1568 # now do the right thing for maps
1569 $self->link_multipart_objects;
1531 $self->difficulty ($self->estimate_difficulty) 1570 $self->difficulty ($self->estimate_difficulty)
1532 unless $self->difficulty; 1571 unless $self->difficulty;
1533 Coro::cede; 1572 Coro::cede;
1573
1574 unless ($self->{deny_activate}) {
1575 $self->decay_objects;
1576 $self->fix_auto_apply;
1577 $self->update_buttons;
1578 Coro::cede;
1579 $self->set_darkness_map;
1580 Coro::cede;
1534 $self->activate; 1581 $self->activate;
1535 Coro::cede; 1582 }
1583
1584 $self->in_memory (cf::MAP_IN_MEMORY);
1536 } 1585 }
1537 1586
1538 $self->post_load; 1587 $self->post_load;
1539 Coro::cede;
1540
1541 $self->in_memory (cf::MAP_IN_MEMORY);
1542} 1588}
1543 1589
1544sub customise_for { 1590sub customise_for {
1545 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1546 1592
1547 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1548 if $self->per_player; 1594 if $self->per_player;
1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1549 1598
1550 $self 1599 $self
1551} 1600}
1552 1601
1553# find and load all maps in the 3x3 area around a map 1602# find and load all maps in the 3x3 area around a map
… …
1664 1713
1665sub reset_at { 1714sub reset_at {
1666 my ($self) = @_; 1715 my ($self) = @_;
1667 1716
1668 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1669 return 1e99 if $self->isa ("ext::map_per_player");#d#
1670 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1671 1719
1672 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1673 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1721 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1674 1722
… …
1685 my ($self) = @_; 1733 my ($self) = @_;
1686 1734
1687 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1688 1736
1689 return if $self->players; 1737 return if $self->players;
1690 return if $self->isa ("ext::map_per_player");#d#
1691 1738
1692 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1693 1740
1694 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1695 1742
1696 # need to save uniques path 1743 # need to save uniques path
1697 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
… …
1866 $self->deactivate_recursive; 1913 $self->deactivate_recursive;
1867 1914
1868 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1915 return if UNIVERSAL::isa $self->map, "ext::map_link";
1869 1916
1870 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1917 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1871 if $self->map; 1918 if $self->map && $self->map->{path} ne "{link}";
1872 1919
1873 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1920 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1874} 1921}
1875 1922
1876sub cf::object::player::leave_link { 1923sub cf::object::player::leave_link {
1877 my ($self, $map, $x, $y) = @_; 1924 my ($self, $map, $x, $y) = @_;
1925
1926 return unless $self->contr->active;
1878 1927
1879 my $link_pos = delete $self->{_link_pos}; 1928 my $link_pos = delete $self->{_link_pos};
1880 1929
1881 unless ($map) { 1930 unless ($map) {
1882 # restore original map position 1931 # restore original map position
… …
1905 1954
1906 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1955 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1907 $self->enter_map ($map, $x, $y); 1956 $self->enter_map ($map, $x, $y);
1908} 1957}
1909 1958
1910cf::player->attach (
1911 on_logout => sub {
1912 my ($pl) = @_;
1913
1914 # abort map switching before logout
1915 if ($pl->ob->{_link_pos}) {
1916 cf::sync_job {
1917 $pl->ob->leave_link
1918 };
1919 }
1920 },
1921 on_login => sub {
1922 my ($pl) = @_;
1923
1924 # try to abort aborted map switching on player login :)
1925 # should happen only on crashes
1926 if ($pl->ob->{_link_pos}) {
1927 $pl->ob->enter_link;
1928 (async {
1929 $pl->ob->reply (undef,
1930 "There was an internal problem at your last logout, "
1931 . "the server will try to bring you to your intended destination in a second.",
1932 cf::NDI_RED);
1933 # we need this sleep as the login has a concurrent enter_exit running
1934 # and this sleep increases chances of the player not ending up in scorn
1935 Coro::Timer::sleep 1;
1936 $pl->ob->leave_link;
1937 })->prio (2);
1938 }
1939 },
1940);
1941
1942=item $player_object->goto ($path, $x, $y) 1959=item $player_object->goto ($path, $x, $y[, $check->($map)])
1943 1960
1961Moves the player to the given map-path and coordinates by first freezing
1962her, loading and preparing them map, calling the provided $check callback
1963that has to return the map if sucecssful, and then unfreezes the player on
1964the new (success) or old (failed) map position.
1965
1944=cut 1966=cut
1967
1968our $GOTOGEN;
1945 1969
1946sub cf::object::player::goto { 1970sub cf::object::player::goto {
1947 my ($self, $path, $x, $y) = @_; 1971 my ($self, $path, $x, $y, $check) = @_;
1972
1973 # do generation counting so two concurrent goto's will be executed in-order
1974 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1948 1975
1949 $self->enter_link; 1976 $self->enter_link;
1950 1977
1951 (async { 1978 (async {
1952 my $map = eval { 1979 my $map = eval {
1953 my $map = cf::map::find $path; 1980 my $map = cf::map::find $path;
1981
1982 if ($map) {
1954 $map = $map->customise_for ($self) if $map; 1983 $map = $map->customise_for ($self);
1984 $map = $check->($map) if $check && $map;
1985 } else {
1986 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1987 }
1988
1955 $map 1989 $map
1990 };
1991
1992 if ($@) {
1993 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1994 LOG llevError | logBacktrace, Carp::longmess $@;
1956 } or 1995 }
1957 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1958 1996
1997 if ($gen == $self->{_goto_generation}) {
1998 delete $self->{_goto_generation};
1959 $self->leave_link ($map, $x, $y); 1999 $self->leave_link ($map, $x, $y);
2000 }
1960 })->prio (1); 2001 })->prio (1);
1961} 2002}
1962 2003
1963=item $player_object->enter_exit ($exit_object) 2004=item $player_object->enter_exit ($exit_object)
1964 2005
… …
2434 2475
2435 die $$res unless "ARRAY" eq ref $res; 2476 die $$res unless "ARRAY" eq ref $res;
2436 2477
2437 return wantarray ? @$res : $res->[-1]; 2478 return wantarray ? @$res : $res->[-1];
2438 } else { 2479 } else {
2480 reset_signals;
2439 local $SIG{__WARN__}; 2481 local $SIG{__WARN__};
2482 local $SIG{__DIE__};
2440 eval { 2483 eval {
2441 local $SIG{__DIE__};
2442 close $fh1; 2484 close $fh1;
2443 2485
2444 my @res = eval { $cb->(@args) }; 2486 my @res = eval { $cb->(@args) };
2445 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 2487 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2446 }; 2488 };
2447 2489
2448 warn $@ if $@; 2490 warn $@ if $@;
2449 _exit 0; 2491 _exit 0;
2450 } 2492 }
2451} 2493}
2452
2453
2454 2494
2455############################################################################# 2495#############################################################################
2456# the server's init and main functions 2496# the server's init and main functions
2457 2497
2458sub load_facedata($) { 2498sub load_facedata($) {
… …
2530sub reload_resources { 2570sub reload_resources {
2531 warn "reloading resource files...\n"; 2571 warn "reloading resource files...\n";
2532 2572
2533 reload_regions; 2573 reload_regions;
2534 reload_facedata; 2574 reload_facedata;
2575 #reload_archetypes;#d#
2535 reload_archetypes; 2576 reload_archetypes;
2536 reload_treasures; 2577 reload_treasures;
2537 2578
2538 warn "finished reloading resource files\n"; 2579 warn "finished reloading resource files\n";
2539} 2580}
… …
2809 my $signal = new Coro::Signal; 2850 my $signal = new Coro::Signal;
2810 push @WAIT_FOR_TICK_BEGIN, $signal; 2851 push @WAIT_FOR_TICK_BEGIN, $signal;
2811 $signal->wait; 2852 $signal->wait;
2812} 2853}
2813 2854
2855 my $min = 1e6;#d#
2856 my $avg = 10;
2814$TICK_WATCHER = Event->timer ( 2857$TICK_WATCHER = Event->timer (
2815 reentrant => 0, 2858 reentrant => 0,
2816 parked => 1, 2859 parked => 1,
2817 prio => 0, 2860 prio => 0,
2818 at => $NEXT_TICK || $TICK, 2861 at => $NEXT_TICK || $TICK,
… …
2822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2865 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2823 unless ++$bug_warning > 10; 2866 unless ++$bug_warning > 10;
2824 return; 2867 return;
2825 } 2868 }
2826 2869
2827 $NOW = Event::time; 2870 $NOW = $tick_start = Event::time;
2828 2871
2829 cf::server_tick; # one server iteration 2872 cf::server_tick; # one server iteration
2873
2874 0 && sync_job {#d#
2875 for(1..10) {
2876 my $t = Event::time;
2877 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2878 or die;
2879
2880 $map->width (50);
2881 $map->height (50);
2882 $map->alloc;
2883 $map->_load_objects ("/tmp/x.map", 1);
2884 my $t = Event::time - $t;
2885
2886 #next unless $t < 0.0013;#d#
2887 if ($t < $min) {
2888 $min = $t;
2889 }
2890 $avg = $avg * 0.99 + $t * 0.01;
2891 }
2892 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2893 exit 0;
2894 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2895 };
2830 2896
2831 $RUNTIME += $TICK; 2897 $RUNTIME += $TICK;
2832 $NEXT_TICK += $TICK; 2898 $NEXT_TICK += $TICK;
2833 2899
2834 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2900 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2840 } 2906 }
2841 2907
2842# my $AFTER = Event::time; 2908# my $AFTER = Event::time;
2843# warn $AFTER - $NOW;#d# 2909# warn $AFTER - $NOW;#d#
2844 2910
2911 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2912 $sig->send;
2913 }
2914 while (my $sig = shift @WAIT_FOR_TICK) {
2915 $sig->send;
2916 }
2917
2918 $NOW = Event::time;
2919
2845 # if we are delayed by four ticks or more, skip them all 2920 # if we are delayed by four ticks or more, skip them all
2846 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2921 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2847 2922
2848 $TICK_WATCHER->at ($NEXT_TICK); 2923 $TICK_WATCHER->at ($NEXT_TICK);
2849 $TICK_WATCHER->start; 2924 $TICK_WATCHER->start;
2850 2925
2851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2926 $LOAD = ($NOW - $tick_start) / $TICK;
2852 $sig->send; 2927 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2853 }
2854 while (my $sig = shift @WAIT_FOR_TICK) {
2855 $sig->send;
2856 }
2857 2928
2858 _post_tick; 2929 _post_tick;
2930
2931
2859 }, 2932 },
2860); 2933);
2861 2934
2862{ 2935{
2863 BDB::max_poll_time $TICK * 0.1; 2936 BDB::max_poll_time $TICK * 0.1;
… …
2922 prio => 6, 2995 prio => 6,
2923 cb => \&IO::AIO::poll_cb, 2996 cb => \&IO::AIO::poll_cb,
2924 ); 2997 );
2925} 2998}
2926 2999
3000my $_log_backtrace;
3001
3002sub _log_backtrace {
3003 my ($msg, @addr) = @_;
3004
3005 $msg =~ s/\n//;
3006
3007 # limit the # of concurrent backtraces
3008 if ($_log_backtrace < 2) {
3009 ++$_log_backtrace;
3010 async {
3011 my @bt = fork_call {
3012 @addr = map { sprintf "%x", $_ } @addr;
3013 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3014 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3015 or die "addr2line: $!";
3016
3017 my @funcs;
3018 my @res = <$fh>;
3019 chomp for @res;
3020 while (@res) {
3021 my ($func, $line) = splice @res, 0, 2, ();
3022 push @funcs, "[$func] $line";
3023 }
3024
3025 @funcs
3026 };
3027
3028 LOG llevInfo, "[ABT] $msg\n";
3029 LOG llevInfo, "[ABT] $_\n" for @bt;
3030 --$_log_backtrace;
3031 };
3032 } else {
3033 LOG llevInfo, "[ABT] $msg\n";
3034 LOG llevInfo, "[ABT] [suppressed]\n";
3035 }
3036}
3037
2927# load additional modules 3038# load additional modules
2928use cf::pod; 3039use cf::pod;
2929 3040
2930END { cf::emergency_save } 3041END { cf::emergency_save }
2931 3042

Diff Legend

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