… | |
… | |
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. |
196 | for my $pkg (qw( |
197 | for my $pkg (qw( |
197 | cf::global cf::attachable |
198 | cf::global cf::attachable |
… | |
… | |
356 | Coro::cede or Event::one_event; |
357 | Coro::cede or Event::one_event; |
357 | } |
358 | } |
358 | |
359 | |
359 | $time = Event::time - $time; |
360 | $time = Event::time - $time; |
360 | |
361 | |
361 | LOG llevError | logBacktrace, "long sync job\n" |
362 | LOG llevError | logBacktrace, Carp::longmess "long sync job" |
362 | if $time > $TICK * 0.5; |
363 | if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; |
363 | |
364 | |
364 | $tick_start += $time; # do not account sync jobs to server load |
365 | $tick_start += $time; # do not account sync jobs to server load |
365 | |
366 | |
366 | wantarray ? @res : $res[0] |
367 | wantarray ? @res : $res[0] |
367 | } else { |
368 | } else { |
… | |
… | |
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, ... |
… | |
… | |
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 |
686 | sub cf::attachable::detach { |
686 | sub 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 | |
697 | sub cf::attachable::attached { |
698 | sub cf::attachable::attached { |
698 | my ($obj, $name) = @_; |
699 | my ($obj, $name) = @_; |
699 | |
700 | |
… | |
… | |
872 | or return; |
873 | or return; |
873 | $av = eval { (Storable::thaw $av)->{objs} }; |
874 | $av = eval { (Storable::thaw $av)->{objs} }; |
874 | } |
875 | } |
875 | |
876 | |
876 | warn sprintf "loading %s (%d)\n", |
877 | warn sprintf "loading %s (%d)\n", |
877 | $filename, length $data, scalar @{$av || []};#d# |
878 | $filename, length $data, scalar @{$av || []}; |
878 | return ($data, $av); |
879 | return ($data, $av); |
879 | } |
880 | } |
880 | |
881 | |
881 | ############################################################################# |
882 | ############################################################################# |
882 | # command handling &c |
883 | # command handling &c |
… | |
… | |
942 | |
943 | |
943 | cf::override; |
944 | cf::override; |
944 | }, |
945 | }, |
945 | ); |
946 | ); |
946 | |
947 | |
947 | sub load_extension { |
|
|
948 | my ($path) = @_; |
|
|
949 | |
|
|
950 | $path =~ /([^\/\\]+)\.ext$/ or die "$path"; |
|
|
951 | my $base = $1; |
|
|
952 | my $pkg = $1; |
|
|
953 | $pkg =~ s/[^[:word:]]/_/g; |
|
|
954 | $pkg = "ext::$pkg"; |
|
|
955 | |
|
|
956 | warn "... loading '$path' into '$pkg'\n"; |
|
|
957 | |
|
|
958 | open my $fh, "<:utf8", $path |
|
|
959 | or die "$path: $!"; |
|
|
960 | |
|
|
961 | my $source = |
|
|
962 | "package $pkg; use strict; use utf8;\n" |
|
|
963 | . "#line 1 \"$path\"\n{\n" |
|
|
964 | . (do { local $/; <$fh> }) |
|
|
965 | . "\n};\n1"; |
|
|
966 | |
|
|
967 | unless (eval $source) { |
|
|
968 | my $msg = $@ ? "$path: $@\n" |
|
|
969 | : "extension disabled.\n"; |
|
|
970 | if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match |
|
|
971 | warn $@; |
|
|
972 | warn "mandatory extension failed to load, exiting.\n"; |
|
|
973 | exit 1; |
|
|
974 | } |
|
|
975 | die $@; |
|
|
976 | } |
|
|
977 | |
|
|
978 | push @EXTS, $pkg; |
|
|
979 | } |
|
|
980 | |
|
|
981 | sub load_extensions { |
948 | sub load_extensions { |
|
|
949 | cf::sync_job { |
|
|
950 | my %todo; |
|
|
951 | |
982 | for my $ext (<$LIBDIR/*.ext>) { |
952 | for my $path (<$LIBDIR/*.ext>) { |
983 | next unless -r $ext; |
953 | next unless -r $path; |
984 | eval { |
954 | |
985 | load_extension $ext; |
955 | $path =~ /([^\/\\]+)\.ext$/ or die "$path"; |
|
|
956 | my $base = $1; |
|
|
957 | my $pkg = $1; |
|
|
958 | $pkg =~ s/[^[:word:]]/_/g; |
|
|
959 | $pkg = "ext::$pkg"; |
|
|
960 | |
|
|
961 | open my $fh, "<:utf8", $path |
|
|
962 | or die "$path: $!"; |
|
|
963 | |
|
|
964 | my $source = do { local $/; <$fh> }; |
|
|
965 | |
|
|
966 | my %ext = ( |
|
|
967 | path => $path, |
|
|
968 | base => $base, |
|
|
969 | pkg => $pkg, |
|
|
970 | ); |
|
|
971 | |
|
|
972 | $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 } |
|
|
973 | if $source =~ /^#!.*?perl.*?#\s*(.*)$/; |
|
|
974 | |
|
|
975 | $ext{source} = |
|
|
976 | "package $pkg; use strict; use utf8;\n" |
|
|
977 | . "#line 1 \"$path\"\n{\n" |
|
|
978 | . $source |
|
|
979 | . "\n};\n1"; |
|
|
980 | |
|
|
981 | $todo{$base} = \%ext; |
|
|
982 | } |
|
|
983 | |
|
|
984 | my %done; |
|
|
985 | while (%todo) { |
|
|
986 | my $progress; |
|
|
987 | |
|
|
988 | while (my ($k, $v) = each %todo) { |
|
|
989 | for (split /,\s*/, $ext{meta}{depends}) { |
|
|
990 | goto skip |
|
|
991 | unless exists $done{$_}; |
|
|
992 | } |
|
|
993 | |
|
|
994 | warn "... loading '$k' into '$v->{pkg}'\n"; |
|
|
995 | |
|
|
996 | unless (eval $v->{source}) { |
|
|
997 | my $msg = $@ ? "$v->{path}: $@\n" |
|
|
998 | : "extension disabled.\n"; |
|
|
999 | |
|
|
1000 | if (exists $v->{meta}{mandatory}) { |
|
|
1001 | warn $msg; |
|
|
1002 | warn "mandatory extension failed to load, exiting.\n"; |
|
|
1003 | exit 1; |
|
|
1004 | } |
|
|
1005 | |
|
|
1006 | die $msg; |
|
|
1007 | } |
|
|
1008 | |
|
|
1009 | $done{$k} = delete $todo{$k}; |
|
|
1010 | push @EXTS, $v->{pkg}; |
986 | 1 |
1011 | } |
987 | } or warn "$ext not loaded: $@"; |
1012 | |
|
|
1013 | skip: |
|
|
1014 | die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" |
|
|
1015 | unless $progress; |
|
|
1016 | } |
988 | } |
1017 | }; |
989 | } |
1018 | } |
990 | |
1019 | |
991 | ############################################################################# |
1020 | ############################################################################# |
992 | |
1021 | |
993 | =head2 CORE EXTENSIONS |
1022 | =head2 CORE EXTENSIONS |
… | |
… | |
1304 | my ($self, $merge) = @_; |
1333 | my ($self, $merge) = @_; |
1305 | |
1334 | |
1306 | # we have to keep some variables in memory intact |
1335 | # we have to keep some variables in memory intact |
1307 | local $self->{path}; |
1336 | local $self->{path}; |
1308 | local $self->{load_path}; |
1337 | local $self->{load_path}; |
1309 | local $self->{deny_save}; |
|
|
1310 | local $self->{deny_reset}; |
|
|
1311 | |
1338 | |
1312 | $self->SUPER::thawer_merge ($merge); |
1339 | $self->SUPER::thawer_merge ($merge); |
1313 | } |
1340 | } |
1314 | |
1341 | |
1315 | sub normalise { |
1342 | sub normalise { |
… | |
… | |
1415 | |
1442 | |
1416 | $_->change_map_light ($change) |
1443 | $_->change_map_light ($change) |
1417 | for grep $_->outdoor, values %cf::MAP; |
1444 | for grep $_->outdoor, values %cf::MAP; |
1418 | } |
1445 | } |
1419 | |
1446 | |
|
|
1447 | sub decay_objects { |
|
|
1448 | my ($self) = @_; |
|
|
1449 | |
|
|
1450 | return if $self->{deny_reset}; |
|
|
1451 | |
|
|
1452 | $self->do_decay_objects; |
|
|
1453 | } |
|
|
1454 | |
1420 | sub unlink_save { |
1455 | sub unlink_save { |
1421 | my ($self) = @_; |
1456 | my ($self) = @_; |
1422 | |
1457 | |
1423 | utf8::encode (my $save = $self->save_path); |
1458 | utf8::encode (my $save = $self->save_path); |
1424 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
1459 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
… | |
… | |
1480 | $self->load_header_orig |
1515 | $self->load_header_orig |
1481 | or return; |
1516 | or return; |
1482 | $self->prepare_orig; |
1517 | $self->prepare_orig; |
1483 | } |
1518 | } |
1484 | |
1519 | |
|
|
1520 | $self->{deny_reset} = 1 |
|
|
1521 | if $self->no_reset; |
|
|
1522 | |
1485 | $self->default_region (cf::region::find_by_path $self->{path}) |
1523 | $self->default_region (cf::region::find_by_path $self->{path}) |
1486 | unless $self->default_region; |
1524 | unless $self->default_region; |
1487 | |
1525 | |
1488 | 1 |
1526 | 1 |
1489 | } |
1527 | } |
… | |
… | |
1504 | $map->{last_save} = $cf::RUNTIME; |
1542 | $map->{last_save} = $cf::RUNTIME; |
1505 | |
1543 | |
1506 | $map->load_header |
1544 | $map->load_header |
1507 | or return; |
1545 | or return; |
1508 | |
1546 | |
1509 | if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) |
1547 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1510 | # doing this can freeze the server in a sync job, obviously |
1548 | # doing this can freeze the server in a sync job, obviously |
1511 | #$cf::WAIT_FOR_TICK->wait; |
1549 | #$cf::WAIT_FOR_TICK->wait; |
1512 | $map->reset; |
1550 | $map->reset; |
1513 | undef $guard; |
1551 | undef $guard; |
1514 | return find $path; |
1552 | return find $path; |
… | |
… | |
1581 | my ($self, $ob) = @_; |
1619 | my ($self, $ob) = @_; |
1582 | |
1620 | |
1583 | return find "~" . $ob->name . "/" . $self->{path} |
1621 | return find "~" . $ob->name . "/" . $self->{path} |
1584 | if $self->per_player; |
1622 | if $self->per_player; |
1585 | |
1623 | |
|
|
1624 | # return find "?party/" . $ob->name . "/" . $self->{path} |
|
|
1625 | # if $self->per_party; |
|
|
1626 | |
1586 | $self |
1627 | $self |
1587 | } |
1628 | } |
1588 | |
1629 | |
1589 | # find and load all maps in the 3x3 area around a map |
1630 | # find and load all maps in the 3x3 area around a map |
1590 | sub load_diag { |
1631 | sub load_diag { |
… | |
… | |
1700 | |
1741 | |
1701 | sub reset_at { |
1742 | sub reset_at { |
1702 | my ($self) = @_; |
1743 | my ($self) = @_; |
1703 | |
1744 | |
1704 | # TODO: safety, remove and allow resettable per-player maps |
1745 | # TODO: safety, remove and allow resettable per-player maps |
1705 | return 1e99 if $self->isa ("ext::map_per_player");#d# |
|
|
1706 | return 1e99 if $self->{deny_reset}; |
1746 | return 1e99 if $self->{deny_reset}; |
1707 | |
1747 | |
1708 | my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; |
1748 | my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; |
1709 | my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; |
1749 | my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; |
1710 | |
1750 | |
… | |
… | |
1721 | my ($self) = @_; |
1761 | my ($self) = @_; |
1722 | |
1762 | |
1723 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1763 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1724 | |
1764 | |
1725 | return if $self->players; |
1765 | return if $self->players; |
1726 | return if $self->isa ("ext::map_per_player");#d# |
|
|
1727 | |
1766 | |
1728 | warn "resetting map ", $self->path;#d# |
1767 | warn "resetting map ", $self->path; |
1729 | |
1768 | |
1730 | $self->in_memory (cf::MAP_SWAPPED); |
1769 | $self->in_memory (cf::MAP_SWAPPED); |
1731 | |
1770 | |
1732 | # need to save uniques path |
1771 | # need to save uniques path |
1733 | unless ($self->{deny_save}) { |
1772 | unless ($self->{deny_save}) { |
… | |
… | |
1765 | $cf::MAP{$self->path} = $self; |
1804 | $cf::MAP{$self->path} = $self; |
1766 | |
1805 | |
1767 | $self->reset; # polite request, might not happen |
1806 | $self->reset; # polite request, might not happen |
1768 | } |
1807 | } |
1769 | |
1808 | |
|
|
1809 | =item $maps = cf::map::tmp_maps |
|
|
1810 | |
|
|
1811 | Returns an arrayref with all map paths of currently instantiated and saved |
|
|
1812 | maps. May block. |
|
|
1813 | |
|
|
1814 | =cut |
|
|
1815 | |
|
|
1816 | sub tmp_maps() { |
|
|
1817 | [ |
|
|
1818 | map { |
|
|
1819 | utf8::decode $_; |
|
|
1820 | /\.map$/ |
|
|
1821 | ? normalise $_ |
|
|
1822 | : () |
|
|
1823 | } @{ aio_readdir $TMPDIR or [] } |
|
|
1824 | ] |
|
|
1825 | } |
|
|
1826 | |
|
|
1827 | =item $maps = cf::map::random_maps |
|
|
1828 | |
|
|
1829 | Returns an arrayref with all map paths of currently instantiated and saved |
|
|
1830 | random maps. May block. |
|
|
1831 | |
|
|
1832 | =cut |
|
|
1833 | |
|
|
1834 | sub random_maps() { |
|
|
1835 | [ |
|
|
1836 | map { |
|
|
1837 | utf8::decode $_; |
|
|
1838 | /\.map$/ |
|
|
1839 | ? normalise "?random/$_" |
|
|
1840 | : () |
|
|
1841 | } @{ aio_readdir $RANDOMDIR or [] } |
|
|
1842 | ] |
|
|
1843 | } |
|
|
1844 | |
1770 | =item cf::map::unique_maps |
1845 | =item cf::map::unique_maps |
1771 | |
1846 | |
1772 | Returns an arrayref of paths of all shared maps that have |
1847 | Returns an arrayref of paths of all shared maps that have |
1773 | instantiated unique items. May block. |
1848 | instantiated unique items. May block. |
1774 | |
1849 | |
1775 | =cut |
1850 | =cut |
1776 | |
1851 | |
1777 | sub unique_maps() { |
1852 | sub unique_maps() { |
1778 | my $files = aio_readdir $UNIQUEDIR |
1853 | [ |
1779 | or return; |
1854 | map { |
1780 | |
|
|
1781 | my @paths; |
|
|
1782 | |
|
|
1783 | for (@$files) { |
|
|
1784 | utf8::decode $_; |
1855 | utf8::decode $_; |
1785 | next if /\.pst$/; |
1856 | /\.map$/ |
1786 | next unless /^$PATH_SEP/o; |
1857 | ? normalise $_ |
1787 | |
1858 | : () |
1788 | push @paths, cf::map::normalise $_; |
1859 | } @{ aio_readdir $UNIQUEDIR or [] } |
1789 | } |
1860 | ] |
1790 | |
|
|
1791 | \@paths |
|
|
1792 | } |
1861 | } |
1793 | |
1862 | |
1794 | package cf; |
1863 | package cf; |
1795 | |
1864 | |
1796 | =back |
1865 | =back |
… | |
… | |
1902 | $self->deactivate_recursive; |
1971 | $self->deactivate_recursive; |
1903 | |
1972 | |
1904 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1973 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1905 | |
1974 | |
1906 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1975 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1907 | if $self->map; |
1976 | if $self->map && $self->map->{path} ne "{link}"; |
1908 | |
1977 | |
1909 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1978 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1910 | } |
1979 | } |
1911 | |
1980 | |
1912 | sub cf::object::player::leave_link { |
1981 | sub cf::object::player::leave_link { |
1913 | my ($self, $map, $x, $y) = @_; |
1982 | my ($self, $map, $x, $y) = @_; |
|
|
1983 | |
|
|
1984 | return unless $self->contr->active; |
1914 | |
1985 | |
1915 | my $link_pos = delete $self->{_link_pos}; |
1986 | my $link_pos = delete $self->{_link_pos}; |
1916 | |
1987 | |
1917 | unless ($map) { |
1988 | unless ($map) { |
1918 | # restore original map position |
1989 | # restore original map position |
… | |
… | |
1941 | |
2012 | |
1942 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2013 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
1943 | $self->enter_map ($map, $x, $y); |
2014 | $self->enter_map ($map, $x, $y); |
1944 | } |
2015 | } |
1945 | |
2016 | |
1946 | cf::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) |
2017 | =item $player_object->goto ($path, $x, $y[, $check->($map)]) |
1979 | |
2018 | |
|
|
2019 | Moves the player to the given map-path and coordinates by first freezing |
|
|
2020 | her, loading and preparing them map, calling the provided $check callback |
|
|
2021 | that has to return the map if sucecssful, and then unfreezes the player on |
|
|
2022 | the new (success) or old (failed) map position. |
|
|
2023 | |
1980 | =cut |
2024 | =cut |
|
|
2025 | |
|
|
2026 | our $GOTOGEN; |
1981 | |
2027 | |
1982 | sub cf::object::player::goto { |
2028 | sub cf::object::player::goto { |
1983 | my ($self, $path, $x, $y) = @_; |
2029 | my ($self, $path, $x, $y, $check) = @_; |
|
|
2030 | |
|
|
2031 | # do generation counting so two concurrent goto's will be executed in-order |
|
|
2032 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
1984 | |
2033 | |
1985 | $self->enter_link; |
2034 | $self->enter_link; |
1986 | |
2035 | |
1987 | (async { |
2036 | (async { |
1988 | my $map = eval { |
2037 | my $map = eval { |
1989 | my $map = cf::map::find $path; |
2038 | my $map = cf::map::find $path; |
|
|
2039 | |
|
|
2040 | if ($map) { |
1990 | $map = $map->customise_for ($self) if $map; |
2041 | $map = $map->customise_for ($self); |
|
|
2042 | $map = $check->($map) if $check && $map; |
|
|
2043 | } else { |
|
|
2044 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
2045 | } |
|
|
2046 | |
1991 | $map |
2047 | $map |
|
|
2048 | }; |
|
|
2049 | |
|
|
2050 | if ($@) { |
|
|
2051 | $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
2052 | LOG llevError | logBacktrace, Carp::longmess $@; |
1992 | } or |
2053 | } |
1993 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1994 | |
2054 | |
|
|
2055 | if ($gen == $self->{_goto_generation}) { |
|
|
2056 | delete $self->{_goto_generation}; |
1995 | $self->leave_link ($map, $x, $y); |
2057 | $self->leave_link ($map, $x, $y); |
|
|
2058 | } |
1996 | })->prio (1); |
2059 | })->prio (1); |
1997 | } |
2060 | } |
1998 | |
2061 | |
1999 | =item $player_object->enter_exit ($exit_object) |
2062 | =item $player_object->enter_exit ($exit_object) |
2000 | |
2063 | |
… | |
… | |
2485 | warn $@ if $@; |
2548 | warn $@ if $@; |
2486 | _exit 0; |
2549 | _exit 0; |
2487 | } |
2550 | } |
2488 | } |
2551 | } |
2489 | |
2552 | |
2490 | |
|
|
2491 | |
|
|
2492 | ############################################################################# |
2553 | ############################################################################# |
2493 | # the server's init and main functions |
2554 | # the server's init and main functions |
2494 | |
2555 | |
2495 | sub load_facedata($) { |
2556 | sub load_facedata($) { |
2496 | my ($path) = @_; |
2557 | my ($path) = @_; |
… | |
… | |
2567 | sub reload_resources { |
2628 | sub reload_resources { |
2568 | warn "reloading resource files...\n"; |
2629 | warn "reloading resource files...\n"; |
2569 | |
2630 | |
2570 | reload_regions; |
2631 | reload_regions; |
2571 | reload_facedata; |
2632 | reload_facedata; |
|
|
2633 | #reload_archetypes;#d# |
2572 | reload_archetypes; |
2634 | reload_archetypes; |
2573 | reload_treasures; |
2635 | reload_treasures; |
2574 | |
2636 | |
2575 | warn "finished reloading resource files\n"; |
2637 | warn "finished reloading resource files\n"; |
2576 | } |
2638 | } |
… | |
… | |
2846 | my $signal = new Coro::Signal; |
2908 | my $signal = new Coro::Signal; |
2847 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2909 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2848 | $signal->wait; |
2910 | $signal->wait; |
2849 | } |
2911 | } |
2850 | |
2912 | |
|
|
2913 | my $min = 1e6;#d# |
|
|
2914 | my $avg = 10; |
2851 | $TICK_WATCHER = Event->timer ( |
2915 | $TICK_WATCHER = Event->timer ( |
2852 | reentrant => 0, |
2916 | reentrant => 0, |
2853 | parked => 1, |
2917 | parked => 1, |
2854 | prio => 0, |
2918 | prio => 0, |
2855 | at => $NEXT_TICK || $TICK, |
2919 | at => $NEXT_TICK || $TICK, |
… | |
… | |
2862 | } |
2926 | } |
2863 | |
2927 | |
2864 | $NOW = $tick_start = Event::time; |
2928 | $NOW = $tick_start = Event::time; |
2865 | |
2929 | |
2866 | cf::server_tick; # one server iteration |
2930 | cf::server_tick; # one server iteration |
|
|
2931 | |
|
|
2932 | 0 && sync_job {#d# |
|
|
2933 | for(1..10) { |
|
|
2934 | my $t = Event::time; |
|
|
2935 | my $map = my $map = new_from_path cf::map "/tmp/x.map" |
|
|
2936 | or die; |
|
|
2937 | |
|
|
2938 | $map->width (50); |
|
|
2939 | $map->height (50); |
|
|
2940 | $map->alloc; |
|
|
2941 | $map->_load_objects ("/tmp/x.map", 1); |
|
|
2942 | my $t = Event::time - $t; |
|
|
2943 | |
|
|
2944 | #next unless $t < 0.0013;#d# |
|
|
2945 | if ($t < $min) { |
|
|
2946 | $min = $t; |
|
|
2947 | } |
|
|
2948 | $avg = $avg * 0.99 + $t * 0.01; |
|
|
2949 | } |
|
|
2950 | warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d# |
|
|
2951 | exit 0; |
|
|
2952 | # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477 |
|
|
2953 | }; |
2867 | |
2954 | |
2868 | $RUNTIME += $TICK; |
2955 | $RUNTIME += $TICK; |
2869 | $NEXT_TICK += $TICK; |
2956 | $NEXT_TICK += $TICK; |
2870 | |
2957 | |
2871 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
2958 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |