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.329 by root, Fri Aug 10 05:38:16 2007 UTC vs.
Revision 1.333 by root, Sun Aug 19 09:14:50 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS 1.4 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
474 475
475=cut 476=cut
476 477
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 478sub fork_call(&@) {
487 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
488 480
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
492 or die "pipe: $!";
493 484
494 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 486 reset_signals;
508 local $SIG{__WARN__}; 487 &$cb
509 local $SIG{__DIE__}; 488 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 489
516 eval { 490 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 491}
529 492
530=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
531 494
532Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
1953 1916
1954 $self 1917 $self
1955} 1918}
1956 1919
1957# find and load all maps in the 3x3 area around a map 1920# find and load all maps in the 3x3 area around a map
1958sub load_diag { 1921sub load_neighbours {
1959 my ($map) = @_; 1922 my ($map) = @_;
1960 1923
1961 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1962 1925
1963 for (0 .. 3) { 1926 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1965 or next; 1928 or next;
1966 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1967 or next; 1930 or next;
1968 $neigh->load; 1931 $neigh->load;
1969 1932
1933 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 1936 }
1973 1937
1974 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1976 or next; 1941 or next;
1977 $neigh->load; 1942 $neigh->load;
1978 } 1943 }
1979} 1944}
1980 1945
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
2352 2317
2353 $map->load; 2318 $map->load;
2354 $map->load_diag; 2319 $map->load_neighbours;
2355 2320
2356 return unless $self->contr->active; 2321 return unless $self->contr->active;
2357 $self->activate_recursive; 2322 $self->activate_recursive;
2358 2323
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2573 $color &= cf::NDI_COLOR_MASK; 2538 $color &= cf::NDI_COLOR_MASK;
2574 2539
2575 utf8::encode $msg; 2540 utf8::encode $msg;
2576 2541
2577 if (0 && $msg =~ /\[/) { 2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2545 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2547 $self->send_packet ("drawinfo $color $msg")
2582 } 2548 }
2583 } 2549 }
… …
2744 2710
2745The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2746 2712
2747 cf::object 2713 cf::object
2748 contr pay_amount pay_player map x y force_find force_add 2714 contr pay_amount pay_player map x y force_find force_add
2749 insert remove 2715 insert remove name archname title slaying race
2750 2716
2751 cf::object::player 2717 cf::object::player
2752 player 2718 player
2753 2719
2754 cf::player 2720 cf::player
… …
2759 2725
2760=cut 2726=cut
2761 2727
2762for ( 2728for (
2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv)], 2730 insert remove inv name archname title slaying race)],
2765 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2768) { 2734) {
2769 no strict 'refs'; 2735 no strict 'refs';

Diff Legend

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