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.320 by root, Tue Jul 24 22:49:40 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
… …
1921 $self->set_darkness_map; 1894 $self->set_darkness_map;
1922 Coro::cede; 1895 Coro::cede;
1923 $self->activate; 1896 $self->activate;
1924 } 1897 }
1925 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1903 }
1928 1904
1929 $self->post_load; 1905 $self->post_load;
1930} 1906}
… …
2240 $self->message ($msg, $flags); 2216 $self->message ($msg, $flags);
2241 } 2217 }
2242 } 2218 }
2243} 2219}
2244 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
2245=item $player_object->may ("access") 2231=item $player_object->may ("access")
2246 2232
2247Returns wether the given player is authorized to access resource "access" 2233Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2234(e.g. "command_wizcast").
2249 2235
… …
2512sub cf::client::send_msg { 2498sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2499 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2500
2515 $msg = $self->pl->expand_cfpod ($msg); 2501 $msg = $self->pl->expand_cfpod ($msg);
2516 2502
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2503 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2504
2519 if (ref $channel) { 2505 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2506 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2507 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2508 $self->{channel}{$channel->{id}} = $channel;
… …
2527 } 2513 }
2528 2514
2529 return unless @extra || length $msg; 2515 return unless @extra || length $msg;
2530 2516
2531 if ($self->can_msg) { 2517 if ($self->can_msg) {
2518 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF;
2521
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2522 $self->send_packet ("msg " . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2524 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2525 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones
2527 for ($msg) {
2528 1 while
2529 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2530 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2531 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2532 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2533 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2534 }
2535
2536 $color &= cf::NDI_COLOR_MASK;
2537
2538 utf8::encode $msg;
2539
2545 if (0 && $msg =~ /\[/) { 2540 if (0 && $msg =~ /\[/) {
2541 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2543 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2545 $self->send_packet ("drawinfo $color $msg")
2550 } 2546 }
2551 } 2547 }
… …
2698our $safe = new Safe "safe"; 2694our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2695our $safe_hole = new Safe::Hole;
2700 2696
2701$SIG{FPE} = 'IGNORE'; 2697$SIG{FPE} = 'IGNORE';
2702 2698
2703$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));
2704 2704
2705# here we export the classes and methods available to script code 2705# here we export the classes and methods available to script code
2706 2706
2707=pod 2707=pod
2708 2708
2709The following functions and methods are available within a safe environment: 2709The following functions and methods are available within a safe environment:
2710 2710
2711 cf::object 2711 cf::object
2712 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
2713 insert remove 2713 insert remove name archname title slaying race
2714 2714
2715 cf::object::player 2715 cf::object::player
2716 player 2716 player
2717 2717
2718 cf::player 2718 cf::player
… …
2723 2723
2724=cut 2724=cut
2725 2725
2726for ( 2726for (
2727 ["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
2728 insert remove)], 2728 insert remove inv name archname title slaying race)],
2729 ["cf::object::player" => qw(player)], 2729 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2730 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2731 ["cf::map" => qw(trigger)],
2732) { 2732) {
2733 no strict 'refs'; 2733 no strict 'refs';
… …
2865 # TODO: for gcfclient pleasure, we should give resources 2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2867 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical; 2868 my $enc = JSON::XS->new->utf8->canonical;
2869 2869
2870 if (my $soundconf = delete $res->{"res/sound.conf"}) { 2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 $soundconf = $enc->decode (delete $soundconf->{data});
2872 # todo
2873 }
2874 2871
2875 while (my ($name, $info) = each %$res) { 2872 while (my ($name, $info) = each %$res) {
2876 my $meta = $enc->encode ({ 2873 my $meta = $enc->encode ({
2877 name => $name, 2874 name => $name,
2878 %{ $info->{meta} || {} }, 2875 %{ $info->{meta} || {} },
… …
2892 } 2889 }
2893 2890
2894 cf::face::set_type $idx, $info->{type}; 2891 cf::face::set_type $idx, $info->{type};
2895 2892
2896 cf::cede_to_tick; 2893 cf::cede_to_tick;
2894 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2897 } 2912 }
2898 } 2913 }
2899 2914
2900 1 2915 1
2901} 2916}

Diff Legend

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