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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.310 by elmex, Mon Jul 16 15:43:49 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
1443 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines
1418 1446
1419 $_ 1447 $_
1420} 1448}
1421 1449
1422sub hintmode { 1450sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1452 $_[0]{hintmode}
1426} 1453}
1427 1454
1428=item $player->ext_reply ($msgid, %msg) 1455=item $player->ext_reply ($msgid, %msg)
… …
1468 my ($path) = @_; 1495 my ($path) = @_;
1469 1496
1470 my ($match, $specificity); 1497 my ($match, $specificity);
1471 1498
1472 for my $region (list) { 1499 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1500 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1501 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1502 if $region->specificity > $specificity;
1476 } 1503 }
1477 } 1504 }
1478 1505
… …
1598 $self->init; # pass $1 etc. 1625 $self->init; # pass $1 etc.
1599 return $self; 1626 return $self;
1600 } 1627 }
1601 } 1628 }
1602 1629
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1630 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1631 ()
1605} 1632}
1606 1633
1607sub init { 1634sub init {
1608 my ($self) = @_; 1635 my ($self) = @_;
… …
1886 1913
1887 undef $MAP_PREFETCH{$path}; 1914 undef $MAP_PREFETCH{$path};
1888 $MAP_PREFETCHER ||= cf::async { 1915 $MAP_PREFETCHER ||= cf::async {
1889 while (%MAP_PREFETCH) { 1916 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 1917 for my $path (keys %MAP_PREFETCH) {
1891 my $map = find $path 1918 if (my $map = find $path) {
1892 or next;
1893 $map->load; 1919 $map->load;
1920 }
1894 1921
1895 delete $MAP_PREFETCH{$path}; 1922 delete $MAP_PREFETCH{$path};
1896 } 1923 }
1897 } 1924 }
1898 undef $MAP_PREFETCHER; 1925 undef $MAP_PREFETCHER;
… …
2235 2262
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2264 $self->enter_map ($map, $x, $y);
2238} 2265}
2239 2266
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2268
2242Moves 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
2243her, loading and preparing them map, calling the provided $check callback 2270her, loading and preparing them map, calling the provided $check callback
2244that 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
2245the 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.
2246 2274
2247=cut 2275=cut
2248 2276
2249our $GOTOGEN; 2277our $GOTOGEN;
2250 2278
2251sub cf::object::player::goto { 2279sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2280 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2281
2254 # 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
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2284
2257 $self->enter_link; 2285 $self->enter_link;
… …
2277 2305
2278 if ($gen == $self->{_goto_generation}) { 2306 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2307 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2308 $self->leave_link ($map, $x, $y);
2281 } 2309 }
2310
2311 $done->() if $done;
2282 })->prio (1); 2312 })->prio (1);
2283} 2313}
2284 2314
2285=item $player_object->enter_exit ($exit_object) 2315=item $player_object->enter_exit ($exit_object)
2286 2316
… …
2355 my $hp = $exit->stats->hp; 2385 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2386 my $sp = $exit->stats->sp;
2357 2387
2358 $self->enter_link; 2388 $self->enter_link;
2359 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
2360 (async { 2394 (async {
2361 $self->deactivate_recursive; # just to be sure 2395 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2396 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2397 $self->goto ($slaying, $hp, $sp);
2364 2398
… …
2404 2438
2405sub cf::client::send_msg { 2439sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2440 my ($self, $color, $type, $msg, @extra) = @_;
2407 2441
2408 $msg = $self->pl->expand_cfpod ($msg); 2442 $msg = $self->pl->expand_cfpod ($msg);
2443
2444 return unless @extra || length $msg;
2409 2445
2410 if ($self->can_msg) { 2446 if ($self->can_msg) {
2411 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2447 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2412 } else { 2448 } else {
2413 # replace some tags by gcfclient-compatible ones 2449 # replace some tags by gcfclient-compatible ones
… …
2438=cut 2474=cut
2439 2475
2440sub cf::client::ext_event($$%) { 2476sub cf::client::ext_event($$%) {
2441 my ($self, $type, %msg) = @_; 2477 my ($self, $type, %msg) = @_;
2442 2478
2479 return unless $self->extcmd;
2480
2443 $msg{msgtype} = "event_$type"; 2481 $msg{msgtype} = "event_$type";
2444 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2445} 2483}
2446 2484
2447=item $success = $client->query ($flags, "text", \&cb) 2485=item $success = $client->query ($flags, "text", \&cb)
… …
2574 2612
2575=pod 2613=pod
2576 2614
2577The following functions and methods are available within a safe environment: 2615The following functions and methods are available within a safe environment:
2578 2616
2579 cf::object contr pay_amount pay_player map 2617 cf::object
2618 contr pay_amount pay_player map x y force_find force_add
2619 insert remove
2620
2580 cf::object::player player 2621 cf::object::player
2581 cf::player peaceful 2622 player
2582 cf::map trigger 2623
2624 cf::player
2625 peaceful
2626
2627 cf::map
2628 trigger
2583 2629
2584=cut 2630=cut
2585 2631
2586for ( 2632for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 2633 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2634 insert remove)],
2588 ["cf::object::player" => qw(player)], 2635 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 2636 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 2637 ["cf::map" => qw(trigger)],
2591) { 2638) {
2592 no strict 'refs'; 2639 no strict 'refs';
… …
2684 { 2731 {
2685 my $faces = $facedata->{faceinfo}; 2732 my $faces = $facedata->{faceinfo};
2686 2733
2687 while (my ($face, $info) = each %$faces) { 2734 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2735 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2736 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2692 Coro::cede; 2740
2741 cf::cede_to_tick;
2693 } 2742 }
2694 2743
2695 while (my ($face, $info) = each %$faces) { 2744 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 2745 next unless $info->{smooth};
2697 my $idx = cf::face::find $face 2746 my $idx = cf::face::find $face
2698 or next; 2747 or next;
2699 if (my $smooth = cf::face::find $info->{smooth}) { 2748 if (my $smooth = cf::face::find $info->{smooth}) {
2749 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2750 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 2751 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2752 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 2753 }
2704 Coro::cede; 2754
2755 cf::cede_to_tick;
2705 } 2756 }
2706 } 2757 }
2707 2758
2708 { 2759 {
2709 my $anims = $facedata->{animinfo}; 2760 my $anims = $facedata->{animinfo};
2710 2761
2711 while (my ($anim, $info) = each %$anims) { 2762 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2763 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 2764 cf::cede_to_tick;
2714 } 2765 }
2715 2766
2716 cf::anim::invalidate_all; # d'oh 2767 cf::anim::invalidate_all; # d'oh
2768 }
2769
2770 {
2771 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical;
2775
2776 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({
2778 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO#
2781 });
2782
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2784
2785 if ($name =~ /\.jpg$/) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2788 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data};
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk;
2794 }
2795
2796 cf::cede_to_tick;
2797 }
2717 } 2798 }
2718 2799
2719 1 2800 1
2720} 2801}
2721 2802
2722sub reload_regions { 2803sub reload_regions {
2723 load_resource_file "$MAPDIR/regions" 2804 load_resource_file "$MAPDIR/regions"
2724 or die "unable to load regions file\n"; 2805 or die "unable to load regions file\n";
2806
2807 for (cf::region::list) {
2808 $_->{match} = qr/$_->{match}/
2809 if exists $_->{match};
2810 }
2725} 2811}
2726 2812
2727sub reload_facedata { 2813sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 2814 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 2815 or die "unable to load facedata\n";

Diff Legend

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