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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.313 by root, Sun Jul 22 14:17:58 2007 UTC

… …
29use Fcntl; 29use Fcntl;
30use YAML::Syck (); 30use YAML::Syck ();
31use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
32use Time::HiRes; 32use Time::HiRes;
33use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
34 35
35# configure various modules to our taste 36# configure various modules to our taste
36# 37#
37$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
166 167
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 169returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
170 177
171=back 178=back
172 179
173=cut 180=cut
174 181
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 416Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 417never block itself or use any form of Event handling.
411 418
412=cut 419=cut
413 420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
414sub fork_call(&@) { 430sub fork_call(&@) {
415 my ($cb, @args) = @_; 431 my ($cb, @args) = @_;
416 432
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
418# or die "socketpair: $!"; 434# or die "socketpair: $!";
… …
421 437
422 if (my $pid = fork) { 438 if (my $pid = fork) {
423 close $fh2; 439 close $fh2;
424 440
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
426 $res = Coro::Storable::thaw $res; 443 $res = Coro::Storable::thaw $res;
427 444
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429 446
430 die $$res unless "ARRAY" eq ref $res; 447 Carp::confess $$res unless "ARRAY" eq ref $res;
431 448
432 return wantarray ? @$res : $res->[-1]; 449 return wantarray ? @$res : $res->[-1];
433 } else { 450 } else {
434 reset_signals; 451 reset_signals;
435 local $SIG{__WARN__}; 452 local $SIG{__WARN__};
436 local $SIG{__DIE__}; 453 local $SIG{__DIE__};
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459
437 eval { 460 eval {
438 close $fh1; 461 close $fh1;
439 462
440 my @res = eval { $cb->(@args) }; 463 my @res = eval { $cb->(@args) };
464
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
442 }; 467 };
443 468
444 warn $@ if $@; 469 warn $@ if $@;
445 _exit 0; 470 _exit 0;
446 } 471 }
… …
847 "; 872 ";
848 die if $@; 873 die if $@;
849} 874}
850 875
851our $override; 876our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 877our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 878
854sub override { 879sub override {
855 $override = 1; 880 $override = 1;
856 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
857} 882}
858 883
859sub do_invoke { 884sub do_invoke {
860 my $event = shift; 885 my $event = shift;
861 my $callbacks = shift; 886 my $callbacks = shift;
862 887
863 @invoke_results = (); 888 @INVOKE_RESULTS = ();
864 889
865 local $override; 890 local $override;
866 891
867 for (@$callbacks) { 892 for (@$callbacks) {
868 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
… …
885 910
886Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
887 912
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 913This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 914removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 916
892=back 917=back
893 918
894=cut 919=cut
895 920
896############################################################################# 921#############################################################################
897# object support 922# object support
923#
924
925sub _can_merge {
926 my ($ob1, $ob2) = @_;
927
928 local $Storable::canonical = 1;
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931
932 $fob1 eq $fob2
933}
898 934
899sub reattach { 935sub reattach {
900 # basically do the same as instantiate, without calling instantiate 936 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 937 my ($obj) = @_;
902 938
… …
1412 1448
1413 # create single paragraphs (very hackish) 1449 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1450 s/(?<=\S)\n(?=\w)/ /g;
1415 1451
1416 # compress some whitespace 1452 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1453 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines
1418 1457
1419 $_ 1458 $_
1420} 1459}
1421 1460
1422sub hintmode { 1461sub hintmode {
… …
1467 my ($path) = @_; 1506 my ($path) = @_;
1468 1507
1469 my ($match, $specificity); 1508 my ($match, $specificity);
1470 1509
1471 for my $region (list) { 1510 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1511 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1512 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1513 if $region->specificity > $specificity;
1475 } 1514 }
1476 } 1515 }
1477 1516
… …
1597 $self->init; # pass $1 etc. 1636 $self->init; # pass $1 etc.
1598 return $self; 1637 return $self;
1599 } 1638 }
1600 } 1639 }
1601 1640
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1641 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1642 ()
1604} 1643}
1605 1644
1606sub init { 1645sub init {
1607 my ($self) = @_; 1646 my ($self) = @_;
… …
1885 1924
1886 undef $MAP_PREFETCH{$path}; 1925 undef $MAP_PREFETCH{$path};
1887 $MAP_PREFETCHER ||= cf::async { 1926 $MAP_PREFETCHER ||= cf::async {
1888 while (%MAP_PREFETCH) { 1927 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 1928 for my $path (keys %MAP_PREFETCH) {
1890 my $map = find $path 1929 if (my $map = find $path) {
1891 or next;
1892 $map->load; 1930 $map->load;
1931 }
1893 1932
1894 delete $MAP_PREFETCH{$path}; 1933 delete $MAP_PREFETCH{$path};
1895 } 1934 }
1896 } 1935 }
1897 undef $MAP_PREFETCHER; 1936 undef $MAP_PREFETCHER;
… …
2234 2273
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2275 $self->enter_map ($map, $x, $y);
2237} 2276}
2238 2277
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2278=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2279
2241Moves the player to the given map-path and coordinates by first freezing 2280Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2281her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2282that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2283the new (success) or old (failed) map position. In either case, $done will
2284be called at the end of this process.
2245 2285
2246=cut 2286=cut
2247 2287
2248our $GOTOGEN; 2288our $GOTOGEN;
2249 2289
2250sub cf::object::player::goto { 2290sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2291 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2292
2253 # do generation counting so two concurrent goto's will be executed in-order 2293 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2295
2256 $self->enter_link; 2296 $self->enter_link;
… …
2276 2316
2277 if ($gen == $self->{_goto_generation}) { 2317 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2318 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2319 $self->leave_link ($map, $x, $y);
2280 } 2320 }
2321
2322 $done->() if $done;
2281 })->prio (1); 2323 })->prio (1);
2282} 2324}
2283 2325
2284=item $player_object->enter_exit ($exit_object) 2326=item $player_object->enter_exit ($exit_object)
2285 2327
… …
2354 my $hp = $exit->stats->hp; 2396 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp; 2397 my $sp = $exit->stats->sp;
2356 2398
2357 $self->enter_link; 2399 $self->enter_link;
2358 2400
2401 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED);
2404
2359 (async { 2405 (async {
2360 $self->deactivate_recursive; # just to be sure 2406 $self->deactivate_recursive; # just to be sure
2361 unless (eval { 2407 unless (eval {
2362 $self->goto ($slaying, $hp, $sp); 2408 $self->goto ($slaying, $hp, $sp);
2363 2409
… …
2390 2436
2391 utf8::encode $text; 2437 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2438 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2439}
2394 2440
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2441=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2442
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2443Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of 2444client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress 2445the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2446the message unless the client supports the msg packet.
2401 2447
2402=cut 2448=cut
2403 2449
2404sub cf::client::send_msg { 2450sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2451 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2452
2407 $msg = $self->pl->expand_cfpod ($msg); 2453 $msg = $self->pl->expand_cfpod ($msg);
2408 2454
2455 $color &= ~cf::NDI_UNIQUE; # just in case...
2456
2457 if (ref $channel) {
2458 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel);
2462 }
2463
2464 $channel = $channel->{id};
2465 }
2466
2467 return unless @extra || length $msg;
2468
2409 if ($self->can_msg) { 2469 if ($self->can_msg) {
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2411 } else { 2471 } else {
2412 # replace some tags by gcfclient-compatible ones 2472 # replace some tags by gcfclient-compatible ones
2413 for ($msg) { 2473 for ($msg) {
2414 1 while 2474 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2437=cut 2497=cut
2438 2498
2439sub cf::client::ext_event($$%) { 2499sub cf::client::ext_event($$%) {
2440 my ($self, $type, %msg) = @_; 2500 my ($self, $type, %msg) = @_;
2441 2501
2502 return unless $self->extcmd;
2503
2442 $msg{msgtype} = "event_$type"; 2504 $msg{msgtype} = "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2444} 2506}
2445 2507
2446=item $success = $client->query ($flags, "text", \&cb) 2508=item $success = $client->query ($flags, "text", \&cb)
… …
2573 2635
2574=pod 2636=pod
2575 2637
2576The following functions and methods are available within a safe environment: 2638The following functions and methods are available within a safe environment:
2577 2639
2578 cf::object contr pay_amount pay_player map 2640 cf::object
2641 contr pay_amount pay_player map x y force_find force_add
2642 insert remove
2643
2579 cf::object::player player 2644 cf::object::player
2580 cf::player peaceful 2645 player
2581 cf::map trigger 2646
2647 cf::player
2648 peaceful
2649
2650 cf::map
2651 trigger
2582 2652
2583=cut 2653=cut
2584 2654
2585for ( 2655for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)],
2587 ["cf::object::player" => qw(player)], 2658 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 2659 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 2660 ["cf::map" => qw(trigger)],
2590) { 2661) {
2591 no strict 'refs'; 2662 no strict 'refs';
… …
2683 { 2754 {
2684 my $faces = $facedata->{faceinfo}; 2755 my $faces = $facedata->{faceinfo};
2685 2756
2686 while (my ($face, $info) = each %$faces) { 2757 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2758 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2759 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2691 Coro::cede; 2763
2764 cf::cede_to_tick;
2692 } 2765 }
2693 2766
2694 while (my ($face, $info) = each %$faces) { 2767 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 2768 next unless $info->{smooth};
2696 my $idx = cf::face::find $face 2769 my $idx = cf::face::find $face
2697 or next; 2770 or next;
2698 if (my $smooth = cf::face::find $info->{smooth}) { 2771 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 2774 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2775 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 2776 }
2703 Coro::cede; 2777
2778 cf::cede_to_tick;
2704 } 2779 }
2705 } 2780 }
2706 2781
2707 { 2782 {
2708 my $anims = $facedata->{animinfo}; 2783 my $anims = $facedata->{animinfo};
2709 2784
2710 while (my ($anim, $info) = each %$anims) { 2785 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2786 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 2787 cf::cede_to_tick;
2713 } 2788 }
2714 2789
2715 cf::anim::invalidate_all; # d'oh 2790 cf::anim::invalidate_all; # d'oh
2791 }
2792
2793 {
2794 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798
2799 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2807
2808 if ($name =~ /\.jpg$/) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2811 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 }
2818
2819 cf::cede_to_tick;
2820 }
2716 } 2821 }
2717 2822
2718 1 2823 1
2719} 2824}
2720 2825
2721sub reload_regions { 2826sub reload_regions {
2722 load_resource_file "$MAPDIR/regions" 2827 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 2828 or die "unable to load regions file\n";
2829
2830 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/
2832 if exists $_->{match};
2833 }
2724} 2834}
2725 2835
2726sub reload_facedata { 2836sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 2837 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 2838 or die "unable to load facedata\n";

Diff Legend

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