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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.311 by root, Fri Jul 20 16:11:10 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: $!";
… …
433 return wantarray ? @$res : $res->[-1]; 449 return wantarray ? @$res : $res->[-1];
434 } else { 450 } else {
435 reset_signals; 451 reset_signals;
436 local $SIG{__WARN__}; 452 local $SIG{__WARN__};
437 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.
438 local $Coro::idle; 457 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX); 458 $Coro::current->prio (Coro::PRIO_MAX);
459
440 eval { 460 eval {
441 close $fh1; 461 close $fh1;
442 462
443 my @res = eval { $cb->(@args) }; 463 my @res = eval { $cb->(@args) };
444 464
445 open my $fh, ">", \my $buf 465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2; 466 close $fh2;
455 }; 467 };
456 468
457 warn $@ if $@; 469 warn $@ if $@;
458 _exit 0; 470 _exit 0;
… …
860 "; 872 ";
861 die if $@; 873 die if $@;
862} 874}
863 875
864our $override; 876our $override;
865our @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?
866 878
867sub override { 879sub override {
868 $override = 1; 880 $override = 1;
869 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
870} 882}
871 883
872sub do_invoke { 884sub do_invoke {
873 my $event = shift; 885 my $event = shift;
874 my $callbacks = shift; 886 my $callbacks = shift;
875 887
876 @invoke_results = (); 888 @INVOKE_RESULTS = ();
877 889
878 local $override; 890 local $override;
879 891
880 for (@$callbacks) { 892 for (@$callbacks) {
881 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
… …
898 910
899Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
900 912
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 916
905=back 917=back
906 918
907=cut 919=cut
908 920
… …
1483 my ($path) = @_; 1495 my ($path) = @_;
1484 1496
1485 my ($match, $specificity); 1497 my ($match, $specificity);
1486 1498
1487 for my $region (list) { 1499 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1500 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1501 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1502 if $region->specificity > $specificity;
1491 } 1503 }
1492 } 1504 }
1493 1505
… …
1613 $self->init; # pass $1 etc. 1625 $self->init; # pass $1 etc.
1614 return $self; 1626 return $self;
1615 } 1627 }
1616 } 1628 }
1617 1629
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1630 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1631 ()
1620} 1632}
1621 1633
1622sub init { 1634sub init {
1623 my ($self) = @_; 1635 my ($self) = @_;
… …
1901 1913
1902 undef $MAP_PREFETCH{$path}; 1914 undef $MAP_PREFETCH{$path};
1903 $MAP_PREFETCHER ||= cf::async { 1915 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 1916 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 1917 for my $path (keys %MAP_PREFETCH) {
1906 my $map = find $path 1918 if (my $map = find $path) {
1907 or next;
1908 $map->load; 1919 $map->load;
1920 }
1909 1921
1910 delete $MAP_PREFETCH{$path}; 1922 delete $MAP_PREFETCH{$path};
1911 } 1923 }
1912 } 1924 }
1913 undef $MAP_PREFETCHER; 1925 undef $MAP_PREFETCHER;
… …
2250 2262
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2264 $self->enter_map ($map, $x, $y);
2253} 2265}
2254 2266
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2268
2257Moves the player to the given map-path and coordinates by first freezing 2269Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2270her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2271that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2272the new (success) or old (failed) map position. In either case, $done will
2273be called at the end of this process.
2261 2274
2262=cut 2275=cut
2263 2276
2264our $GOTOGEN; 2277our $GOTOGEN;
2265 2278
2266sub cf::object::player::goto { 2279sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2280 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2281
2269 # do generation counting so two concurrent goto's will be executed in-order 2282 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2284
2272 $self->enter_link; 2285 $self->enter_link;
… …
2292 2305
2293 if ($gen == $self->{_goto_generation}) { 2306 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2307 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2308 $self->leave_link ($map, $x, $y);
2296 } 2309 }
2310
2311 $done->() if $done;
2297 })->prio (1); 2312 })->prio (1);
2298} 2313}
2299 2314
2300=item $player_object->enter_exit ($exit_object) 2315=item $player_object->enter_exit ($exit_object)
2301 2316
… …
2410 2425
2411 utf8::encode $text; 2426 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2428}
2414 2429
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2430=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2431
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2432Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2433client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2434the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2435the message unless the client supports the msg packet.
2421 2436
2422=cut 2437=cut
2423 2438
2424sub cf::client::send_msg { 2439sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2440 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2441
2427 $msg = $self->pl->expand_cfpod ($msg); 2442 $msg = $self->pl->expand_cfpod ($msg);
2428 2443
2429 return unless @extra || length $msg; 2444 return unless @extra || length $msg;
2430 2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case...
2447
2448 if (ref $channel) {
2449 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel);
2453 }
2454
2455 $channel = $channel->{id};
2456 }
2457
2431 if ($self->can_msg) { 2458 if ($self->can_msg) {
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2433 } else { 2460 } else {
2434 # replace some tags by gcfclient-compatible ones 2461 # replace some tags by gcfclient-compatible ones
2435 for ($msg) { 2462 for ($msg) {
2436 1 while 2463 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2458 2485
2459=cut 2486=cut
2460 2487
2461sub cf::client::ext_event($$%) { 2488sub cf::client::ext_event($$%) {
2462 my ($self, $type, %msg) = @_; 2489 my ($self, $type, %msg) = @_;
2490
2491 return unless $self->extcmd;
2463 2492
2464 $msg{msgtype} = "event_$type"; 2493 $msg{msgtype} = "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2466} 2495}
2467 2496
… …
2714 { 2743 {
2715 my $faces = $facedata->{faceinfo}; 2744 my $faces = $facedata->{faceinfo};
2716 2745
2717 while (my ($face, $info) = each %$faces) { 2746 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2747 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2748 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2722 Coro::cede; 2752
2753 cf::cede_to_tick;
2723 } 2754 }
2724 2755
2725 while (my ($face, $info) = each %$faces) { 2756 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2757 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2758 my $idx = cf::face::find $face
2728 or next; 2759 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2760 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2763 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2764 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2765 }
2734 Coro::cede; 2766
2767 cf::cede_to_tick;
2735 } 2768 }
2736 } 2769 }
2737 2770
2738 { 2771 {
2739 my $anims = $facedata->{animinfo}; 2772 my $anims = $facedata->{animinfo};
2740 2773
2741 while (my ($anim, $info) = each %$anims) { 2774 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2775 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2776 cf::cede_to_tick;
2744 } 2777 }
2745 2778
2746 cf::anim::invalidate_all; # d'oh 2779 cf::anim::invalidate_all; # d'oh
2780 }
2781
2782 {
2783 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787
2788 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2796
2797 if ($name =~ /\.jpg$/) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2800 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 }
2807
2808 cf::cede_to_tick;
2809 }
2747 } 2810 }
2748 2811
2749 1 2812 1
2750} 2813}
2751 2814
2752sub reload_regions { 2815sub reload_regions {
2753 load_resource_file "$MAPDIR/regions" 2816 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 2817 or die "unable to load regions file\n";
2818
2819 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/
2821 if exists $_->{match};
2822 }
2755} 2823}
2756 2824
2757sub reload_facedata { 2825sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 2826 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 2827 or die "unable to load facedata\n";

Diff Legend

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