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.327 by root, Wed Aug 1 17:22:51 2007 UTC vs.
Revision 1.332 by root, Sat Aug 18 17:33:53 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.
… …
1370 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1371 1334
1372 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1373 1336
1374 $self 1337 $self
1338}
1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1375} 1348}
1376 1349
1377=item $pl->quit_character 1350=item $pl->quit_character
1378 1351
1379Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
2243 $self->message ($msg, $flags); 2216 $self->message ($msg, $flags);
2244 } 2217 }
2245 } 2218 }
2246} 2219}
2247 2220
2221=item $object->send_msg ($channel, $msg, $color, [extra...])
2222
2223=cut
2224
2225sub cf::object::send_msg {
2226 my $pl = shift->contr
2227 or return;
2228 $pl->send_msg (@_);
2229}
2230
2248=item $player_object->may ("access") 2231=item $player_object->may ("access")
2249 2232
2250Returns wether the given player is authorized to access resource "access" 2233Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2234(e.g. "command_wizcast").
2252 2235
… …
2553 $color &= cf::NDI_COLOR_MASK; 2536 $color &= cf::NDI_COLOR_MASK;
2554 2537
2555 utf8::encode $msg; 2538 utf8::encode $msg;
2556 2539
2557 if (0 && $msg =~ /\[/) { 2540 if (0 && $msg =~ /\[/) {
2541 # COMMAND/INFO
2558 $self->send_packet ("drawextinfo $color 4 0 $msg") 2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2559 } else { 2543 } else {
2560 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2561 $self->send_packet ("drawinfo $color $msg") 2545 $self->send_packet ("drawinfo $color $msg")
2562 } 2546 }
2563 } 2547 }
… …
2710our $safe = new Safe "safe"; 2694our $safe = new Safe "safe";
2711our $safe_hole = new Safe::Hole; 2695our $safe_hole = new Safe::Hole;
2712 2696
2713$SIG{FPE} = 'IGNORE'; 2697$SIG{FPE} = 'IGNORE';
2714 2698
2715$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2699$safe->permit_only (Opcode::opset qw(
2700 :base_core :base_mem :base_orig :base_math
2701 grepstart grepwhile mapstart mapwhile
2702 sort time
2703));
2716 2704
2717# here we export the classes and methods available to script code 2705# here we export the classes and methods available to script code
2718 2706
2719=pod 2707=pod
2720 2708
2721The following functions and methods are available within a safe environment: 2709The following functions and methods are available within a safe environment:
2722 2710
2723 cf::object 2711 cf::object
2724 contr pay_amount pay_player map x y force_find force_add 2712 contr pay_amount pay_player map x y force_find force_add
2725 insert remove 2713 insert remove name archname title slaying race
2726 2714
2727 cf::object::player 2715 cf::object::player
2728 player 2716 player
2729 2717
2730 cf::player 2718 cf::player
… …
2735 2723
2736=cut 2724=cut
2737 2725
2738for ( 2726for (
2739 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2740 insert remove)], 2728 insert remove inv name archname title slaying race)],
2741 ["cf::object::player" => qw(player)], 2729 ["cf::object::player" => qw(player)],
2742 ["cf::player" => qw(peaceful)], 2730 ["cf::player" => qw(peaceful)],
2743 ["cf::map" => qw(trigger)], 2731 ["cf::map" => qw(trigger)],
2744) { 2732) {
2745 no strict 'refs'; 2733 no strict 'refs';

Diff Legend

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