… | |
… | |
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 |
… | |
… | |
1304 | my ($self, $merge) = @_; |
1305 | my ($self, $merge) = @_; |
1305 | |
1306 | |
1306 | # we have to keep some variables in memory intact |
1307 | # we have to keep some variables in memory intact |
1307 | local $self->{path}; |
1308 | local $self->{path}; |
1308 | local $self->{load_path}; |
1309 | local $self->{load_path}; |
1309 | local $self->{deny_save}; |
|
|
1310 | local $self->{deny_reset}; |
|
|
1311 | |
1310 | |
1312 | $self->SUPER::thawer_merge ($merge); |
1311 | $self->SUPER::thawer_merge ($merge); |
1313 | } |
1312 | } |
1314 | |
1313 | |
1315 | sub normalise { |
1314 | sub normalise { |
… | |
… | |
1415 | |
1414 | |
1416 | $_->change_map_light ($change) |
1415 | $_->change_map_light ($change) |
1417 | for grep $_->outdoor, values %cf::MAP; |
1416 | for grep $_->outdoor, values %cf::MAP; |
1418 | } |
1417 | } |
1419 | |
1418 | |
|
|
1419 | sub decay_objects { |
|
|
1420 | my ($self) = @_; |
|
|
1421 | |
|
|
1422 | return if $self->{deny_reset}; |
|
|
1423 | |
|
|
1424 | $self->do_decay_objects; |
|
|
1425 | } |
|
|
1426 | |
1420 | sub unlink_save { |
1427 | sub unlink_save { |
1421 | my ($self) = @_; |
1428 | my ($self) = @_; |
1422 | |
1429 | |
1423 | utf8::encode (my $save = $self->save_path); |
1430 | utf8::encode (my $save = $self->save_path); |
1424 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
1431 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
… | |
… | |
1480 | $self->load_header_orig |
1487 | $self->load_header_orig |
1481 | or return; |
1488 | or return; |
1482 | $self->prepare_orig; |
1489 | $self->prepare_orig; |
1483 | } |
1490 | } |
1484 | |
1491 | |
|
|
1492 | $self->{deny_reset} = 1 |
|
|
1493 | if $self->no_reset; |
|
|
1494 | |
1485 | $self->default_region (cf::region::find_by_path $self->{path}) |
1495 | $self->default_region (cf::region::find_by_path $self->{path}) |
1486 | unless $self->default_region; |
1496 | unless $self->default_region; |
1487 | |
1497 | |
1488 | 1 |
1498 | 1 |
1489 | } |
1499 | } |
… | |
… | |
1504 | $map->{last_save} = $cf::RUNTIME; |
1514 | $map->{last_save} = $cf::RUNTIME; |
1505 | |
1515 | |
1506 | $map->load_header |
1516 | $map->load_header |
1507 | or return; |
1517 | or return; |
1508 | |
1518 | |
1509 | if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) |
1519 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1510 | # doing this can freeze the server in a sync job, obviously |
1520 | # doing this can freeze the server in a sync job, obviously |
1511 | #$cf::WAIT_FOR_TICK->wait; |
1521 | #$cf::WAIT_FOR_TICK->wait; |
1512 | $map->reset; |
1522 | $map->reset; |
1513 | undef $guard; |
1523 | undef $guard; |
1514 | return find $path; |
1524 | return find $path; |
… | |
… | |
1581 | my ($self, $ob) = @_; |
1591 | my ($self, $ob) = @_; |
1582 | |
1592 | |
1583 | return find "~" . $ob->name . "/" . $self->{path} |
1593 | return find "~" . $ob->name . "/" . $self->{path} |
1584 | if $self->per_player; |
1594 | if $self->per_player; |
1585 | |
1595 | |
|
|
1596 | # return find "?party/" . $ob->name . "/" . $self->{path} |
|
|
1597 | # if $self->per_party; |
|
|
1598 | |
1586 | $self |
1599 | $self |
1587 | } |
1600 | } |
1588 | |
1601 | |
1589 | # 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 |
1590 | sub load_diag { |
1603 | sub load_diag { |
… | |
… | |
1700 | |
1713 | |
1701 | sub reset_at { |
1714 | sub reset_at { |
1702 | my ($self) = @_; |
1715 | my ($self) = @_; |
1703 | |
1716 | |
1704 | # TODO: safety, remove and allow resettable per-player maps |
1717 | # 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}; |
1718 | return 1e99 if $self->{deny_reset}; |
1707 | |
1719 | |
1708 | my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; |
1720 | my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; |
1709 | 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; |
1710 | |
1722 | |
… | |
… | |
1721 | my ($self) = @_; |
1733 | my ($self) = @_; |
1722 | |
1734 | |
1723 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1735 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1724 | |
1736 | |
1725 | return if $self->players; |
1737 | return if $self->players; |
1726 | return if $self->isa ("ext::map_per_player");#d# |
|
|
1727 | |
1738 | |
1728 | warn "resetting map ", $self->path;#d# |
1739 | warn "resetting map ", $self->path; |
1729 | |
1740 | |
1730 | $self->in_memory (cf::MAP_SWAPPED); |
1741 | $self->in_memory (cf::MAP_SWAPPED); |
1731 | |
1742 | |
1732 | # need to save uniques path |
1743 | # need to save uniques path |
1733 | unless ($self->{deny_save}) { |
1744 | unless ($self->{deny_save}) { |
… | |
… | |
1902 | $self->deactivate_recursive; |
1913 | $self->deactivate_recursive; |
1903 | |
1914 | |
1904 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1915 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1905 | |
1916 | |
1906 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1917 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1907 | if $self->map; |
1918 | if $self->map && $self->map->{path} ne "{link}"; |
1908 | |
1919 | |
1909 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1920 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1910 | } |
1921 | } |
1911 | |
1922 | |
1912 | sub cf::object::player::leave_link { |
1923 | sub cf::object::player::leave_link { |
1913 | my ($self, $map, $x, $y) = @_; |
1924 | my ($self, $map, $x, $y) = @_; |
|
|
1925 | |
|
|
1926 | return unless $self->contr->active; |
1914 | |
1927 | |
1915 | my $link_pos = delete $self->{_link_pos}; |
1928 | my $link_pos = delete $self->{_link_pos}; |
1916 | |
1929 | |
1917 | unless ($map) { |
1930 | unless ($map) { |
1918 | # restore original map position |
1931 | # restore original map position |
… | |
… | |
1941 | |
1954 | |
1942 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
1955 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
1943 | $self->enter_map ($map, $x, $y); |
1956 | $self->enter_map ($map, $x, $y); |
1944 | } |
1957 | } |
1945 | |
1958 | |
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) |
1959 | =item $player_object->goto ($path, $x, $y[, $check->($map)]) |
1979 | |
1960 | |
|
|
1961 | Moves the player to the given map-path and coordinates by first freezing |
|
|
1962 | her, loading and preparing them map, calling the provided $check callback |
|
|
1963 | that has to return the map if sucecssful, and then unfreezes the player on |
|
|
1964 | the new (success) or old (failed) map position. |
|
|
1965 | |
1980 | =cut |
1966 | =cut |
|
|
1967 | |
|
|
1968 | our $GOTOGEN; |
1981 | |
1969 | |
1982 | sub cf::object::player::goto { |
1970 | sub cf::object::player::goto { |
1983 | 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; |
1984 | |
1975 | |
1985 | $self->enter_link; |
1976 | $self->enter_link; |
1986 | |
1977 | |
1987 | (async { |
1978 | (async { |
1988 | my $map = eval { |
1979 | my $map = eval { |
1989 | my $map = cf::map::find $path; |
1980 | my $map = cf::map::find $path; |
|
|
1981 | |
|
|
1982 | if ($map) { |
1990 | $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 | |
1991 | $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 $@; |
1992 | } or |
1995 | } |
1993 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
1994 | |
1996 | |
|
|
1997 | if ($gen == $self->{_goto_generation}) { |
|
|
1998 | delete $self->{_goto_generation}; |
1995 | $self->leave_link ($map, $x, $y); |
1999 | $self->leave_link ($map, $x, $y); |
|
|
2000 | } |
1996 | })->prio (1); |
2001 | })->prio (1); |
1997 | } |
2002 | } |
1998 | |
2003 | |
1999 | =item $player_object->enter_exit ($exit_object) |
2004 | =item $player_object->enter_exit ($exit_object) |
2000 | |
2005 | |
… | |
… | |
2485 | warn $@ if $@; |
2490 | warn $@ if $@; |
2486 | _exit 0; |
2491 | _exit 0; |
2487 | } |
2492 | } |
2488 | } |
2493 | } |
2489 | |
2494 | |
2490 | |
|
|
2491 | |
|
|
2492 | ############################################################################# |
2495 | ############################################################################# |
2493 | # the server's init and main functions |
2496 | # the server's init and main functions |
2494 | |
2497 | |
2495 | sub load_facedata($) { |
2498 | sub load_facedata($) { |
2496 | my ($path) = @_; |
2499 | my ($path) = @_; |
… | |
… | |
2567 | sub reload_resources { |
2570 | sub reload_resources { |
2568 | warn "reloading resource files...\n"; |
2571 | warn "reloading resource files...\n"; |
2569 | |
2572 | |
2570 | reload_regions; |
2573 | reload_regions; |
2571 | reload_facedata; |
2574 | reload_facedata; |
|
|
2575 | #reload_archetypes;#d# |
2572 | reload_archetypes; |
2576 | reload_archetypes; |
2573 | reload_treasures; |
2577 | reload_treasures; |
2574 | |
2578 | |
2575 | warn "finished reloading resource files\n"; |
2579 | warn "finished reloading resource files\n"; |
2576 | } |
2580 | } |
… | |
… | |
2846 | my $signal = new Coro::Signal; |
2850 | my $signal = new Coro::Signal; |
2847 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2851 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2848 | $signal->wait; |
2852 | $signal->wait; |
2849 | } |
2853 | } |
2850 | |
2854 | |
|
|
2855 | my $min = 1e6;#d# |
|
|
2856 | my $avg = 10; |
2851 | $TICK_WATCHER = Event->timer ( |
2857 | $TICK_WATCHER = Event->timer ( |
2852 | reentrant => 0, |
2858 | reentrant => 0, |
2853 | parked => 1, |
2859 | parked => 1, |
2854 | prio => 0, |
2860 | prio => 0, |
2855 | at => $NEXT_TICK || $TICK, |
2861 | at => $NEXT_TICK || $TICK, |
… | |
… | |
2862 | } |
2868 | } |
2863 | |
2869 | |
2864 | $NOW = $tick_start = Event::time; |
2870 | $NOW = $tick_start = Event::time; |
2865 | |
2871 | |
2866 | 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 | }; |
2867 | |
2896 | |
2868 | $RUNTIME += $TICK; |
2897 | $RUNTIME += $TICK; |
2869 | $NEXT_TICK += $TICK; |
2898 | $NEXT_TICK += $TICK; |
2870 | |
2899 | |
2871 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
2900 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |