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.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.527 by root, Fri Apr 23 04:32:47 2010 UTC

108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE;
112 112
113our $OUTPUT_RATE_MIN = 4000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 0;#d#
115 118
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 121our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
1192 1195
1193 sync_job { 1196 sync_job {
1194 if (length $$rdata) { 1197 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1198 1202
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
1259 $av = $st->{objs}; 1263 $av = $st->{objs};
1260 } 1264 }
1261 1265
1262 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1265 1270
1266 ($data, $av) 1271 ($data, $av)
1267} 1272}
1268 1273
1269=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1842 1847
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1849}
1845 1850
1846# also paths starting with '/' 1851# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 1853
1849sub thawer_merge { 1854sub thawer_merge {
1850 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1851 1856
1852 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
2162 or next; 2167 or next;
2163 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2164 or next; 2169 or next;
2165 $neigh->load; 2170 $neigh->load;
2166 2171
2172 # now find the diagonal neighbours
2167 push @neigh, 2173 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2176 }
2171 2177
2343 2349
2344 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2345 2351
2346 $self->unlink_save; 2352 $self->unlink_save;
2347 2353
2348 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2359
2583 2589
2584Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2585 2591
2586The player should be reasonably safe there for short amounts of time (e.g. 2592The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2594though, as the player cannot control the character while it is on the link
2589map. 2595map.
2590 2596
2591Will never block. 2597Will never block.
2592 2598
2593=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
2614sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2615 my ($self) = @_; 2621 my ($self) = @_;
2616 2622
2617 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2618 2624
2625 ++$self->{_link_recursion};
2626
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2628
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2623 2631
2654 $map->load_neighbours; 2662 $map->load_neighbours;
2655 2663
2656 return unless $self->contr->active; 2664 return unless $self->contr->active;
2657 2665
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2660 2668 # entering was successful
2669 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2670 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2671 $self->activate_recursive;
2663} 2672 }
2664 2673
2674}
2675
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2677
2667Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2680that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2681the new (success) or old (failed) map position. In either case, $done will
2677 2688
2678our $GOTOGEN; 2689our $GOTOGEN;
2679 2690
2680sub cf::object::player::goto { 2691sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2682 2699
2683 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2702
2686 $self->enter_link; 2703 $self->enter_link;
2710 my $map = eval { 2727 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2712 2729
2713 if ($map) { 2730 if ($map) {
2714 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2733 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2735 }
2719 2736
2720 $map 2737 $map
2728 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2731 } 2748 }
2732 2749
2733 $done->() if $done; 2750 $done->($self) if $done;
2734 })->prio (1); 2751 })->prio (1);
2735} 2752}
2736 2753
2737=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2738 2755
3511 or return; 3528 or return;
3512 3529
3513 local $/; 3530 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3515 3532
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3534
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3537
3521 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines