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.293 by root, Tue Jul 3 05:14:15 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: $!";
… …
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
… …
1412 1437
1413 # create single paragraphs (very hackish) 1438 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1439 s/(?<=\S)\n(?=\w)/ /g;
1415 1440
1416 # compress some whitespace 1441 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1442 s/\s+\n/\n/g; # ws line-ends
1418 1443 s/\n\n+/\n/g; # double lines
1419 s/^\s+//; 1444 s/^\n+//; # beginning lines
1420 s/\s+$//; 1445 s/\n+$//; # ending lines
1421 1446
1422 $_ 1447 $_
1423} 1448}
1424 1449
1425sub hintmode { 1450sub hintmode {
… …
1470 my ($path) = @_; 1495 my ($path) = @_;
1471 1496
1472 my ($match, $specificity); 1497 my ($match, $specificity);
1473 1498
1474 for my $region (list) { 1499 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1500 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1501 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1502 if $region->specificity > $specificity;
1478 } 1503 }
1479 } 1504 }
1480 1505
… …
1600 $self->init; # pass $1 etc. 1625 $self->init; # pass $1 etc.
1601 return $self; 1626 return $self;
1602 } 1627 }
1603 } 1628 }
1604 1629
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1630 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1631 ()
1607} 1632}
1608 1633
1609sub init { 1634sub init {
1610 my ($self) = @_; 1635 my ($self) = @_;
… …
1888 1913
1889 undef $MAP_PREFETCH{$path}; 1914 undef $MAP_PREFETCH{$path};
1890 $MAP_PREFETCHER ||= cf::async { 1915 $MAP_PREFETCHER ||= cf::async {
1891 while (%MAP_PREFETCH) { 1916 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 1917 for my $path (keys %MAP_PREFETCH) {
1893 my $map = find $path 1918 if (my $map = find $path) {
1894 or next;
1895 $map->load; 1919 $map->load;
1920 }
1896 1921
1897 delete $MAP_PREFETCH{$path}; 1922 delete $MAP_PREFETCH{$path};
1898 } 1923 }
1899 } 1924 }
1900 undef $MAP_PREFETCHER; 1925 undef $MAP_PREFETCHER;
… …
2237 2262
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2264 $self->enter_map ($map, $x, $y);
2240} 2265}
2241 2266
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2268
2244Moves 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
2245her, loading and preparing them map, calling the provided $check callback 2270her, loading and preparing them map, calling the provided $check callback
2246that 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
2247the 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.
2248 2274
2249=cut 2275=cut
2250 2276
2251our $GOTOGEN; 2277our $GOTOGEN;
2252 2278
2253sub cf::object::player::goto { 2279sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2280 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2281
2256 # 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
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2284
2259 $self->enter_link; 2285 $self->enter_link;
… …
2279 2305
2280 if ($gen == $self->{_goto_generation}) { 2306 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2307 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2308 $self->leave_link ($map, $x, $y);
2283 } 2309 }
2310
2311 $done->() if $done;
2284 })->prio (1); 2312 })->prio (1);
2285} 2313}
2286 2314
2287=item $player_object->enter_exit ($exit_object) 2315=item $player_object->enter_exit ($exit_object)
2288 2316
… …
2357 my $hp = $exit->stats->hp; 2385 my $hp = $exit->stats->hp;
2358 my $sp = $exit->stats->sp; 2386 my $sp = $exit->stats->sp;
2359 2387
2360 $self->enter_link; 2388 $self->enter_link;
2361 2389
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2362 (async { 2394 (async {
2363 $self->deactivate_recursive; # just to be sure 2395 $self->deactivate_recursive; # just to be sure
2364 unless (eval { 2396 unless (eval {
2365 $self->goto ($slaying, $hp, $sp); 2397 $self->goto ($slaying, $hp, $sp);
2366 2398
… …
2393 2425
2394 utf8::encode $text; 2426 utf8::encode $text;
2395 $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);
2396} 2428}
2397 2429
2398=item $client->send_msg ($color, $type, $msg, [extra...]) 2430=item $client->send_msg ($channel, $msg, $color, [extra...])
2399 2431
2400Send 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
2401client 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
2402the 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
2403the message unless the client supports the msg packet. 2435the message unless the client supports the msg packet.
2404 2436
2405=cut 2437=cut
2406 2438
2407sub cf::client::send_msg { 2439sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_; 2440 my ($self, $channel, $msg, $color, @extra) = @_;
2409 2441
2410 $msg = $self->pl->expand_cfpod ($msg); 2442 $msg = $self->pl->expand_cfpod ($msg);
2411 2443
2444 return unless @extra || length $msg;
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
2412 if ($self->can_msg) { 2458 if ($self->can_msg) {
2413 $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]));
2414 } else { 2460 } else {
2415 # replace some tags by gcfclient-compatible ones 2461 # replace some tags by gcfclient-compatible ones
2416 for ($msg) { 2462 for ($msg) {
2417 1 while 2463 1 while
2418 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2440=cut 2486=cut
2441 2487
2442sub cf::client::ext_event($$%) { 2488sub cf::client::ext_event($$%) {
2443 my ($self, $type, %msg) = @_; 2489 my ($self, $type, %msg) = @_;
2444 2490
2491 return unless $self->extcmd;
2492
2445 $msg{msgtype} = "event_$type"; 2493 $msg{msgtype} = "event_$type";
2446 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2447} 2495}
2448 2496
2449=item $success = $client->query ($flags, "text", \&cb) 2497=item $success = $client->query ($flags, "text", \&cb)
… …
2576 2624
2577=pod 2625=pod
2578 2626
2579The following functions and methods are available within a safe environment: 2627The following functions and methods are available within a safe environment:
2580 2628
2581 cf::object contr pay_amount pay_player map 2629 cf::object
2630 contr pay_amount pay_player map x y force_find force_add
2631 insert remove
2632
2582 cf::object::player player 2633 cf::object::player
2583 cf::player peaceful 2634 player
2584 cf::map trigger 2635
2636 cf::player
2637 peaceful
2638
2639 cf::map
2640 trigger
2585 2641
2586=cut 2642=cut
2587 2643
2588for ( 2644for (
2589 ["cf::object" => qw(contr pay_amount pay_player map)], 2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)],
2590 ["cf::object::player" => qw(player)], 2647 ["cf::object::player" => qw(player)],
2591 ["cf::player" => qw(peaceful)], 2648 ["cf::player" => qw(peaceful)],
2592 ["cf::map" => qw(trigger)], 2649 ["cf::map" => qw(trigger)],
2593) { 2650) {
2594 no strict 'refs'; 2651 no strict 'refs';
… …
2686 { 2743 {
2687 my $faces = $facedata->{faceinfo}; 2744 my $faces = $facedata->{faceinfo};
2688 2745
2689 while (my ($face, $info) = each %$faces) { 2746 while (my ($face, $info) = each %$faces) {
2690 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2747 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2691 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2748 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap};
2692 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2693 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2694 Coro::cede; 2752
2753 cf::cede_to_tick;
2695 } 2754 }
2696 2755
2697 while (my ($face, $info) = each %$faces) { 2756 while (my ($face, $info) = each %$faces) {
2698 next unless $info->{smooth}; 2757 next unless $info->{smooth};
2699 my $idx = cf::face::find $face 2758 my $idx = cf::face::find $face
2700 or next; 2759 or next;
2701 if (my $smooth = cf::face::find $info->{smooth}) { 2760 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth;
2702 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2703 } else { 2763 } else {
2704 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2764 warn "smooth face '$info->{smooth}' not found for face '$face'";
2705 } 2765 }
2706 Coro::cede; 2766
2767 cf::cede_to_tick;
2707 } 2768 }
2708 } 2769 }
2709 2770
2710 { 2771 {
2711 my $anims = $facedata->{animinfo}; 2772 my $anims = $facedata->{animinfo};
2712 2773
2713 while (my ($anim, $info) = each %$anims) { 2774 while (my ($anim, $info) = each %$anims) {
2714 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2775 cf::anim::set $anim, $info->{frames}, $info->{facings};
2715 Coro::cede; 2776 cf::cede_to_tick;
2716 } 2777 }
2717 2778
2718 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 }
2719 } 2810 }
2720 2811
2721 1 2812 1
2722} 2813}
2723 2814
2724sub reload_regions { 2815sub reload_regions {
2725 load_resource_file "$MAPDIR/regions" 2816 load_resource_file "$MAPDIR/regions"
2726 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 }
2727} 2823}
2728 2824
2729sub reload_facedata { 2825sub reload_facedata {
2730 load_facedata "$DATADIR/facedata" 2826 load_facedata "$DATADIR/facedata"
2731 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