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.315 by root, Mon Jul 23 17:53:55 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
… …
315 }; 322 };
316 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
317 $guard 324 $guard
318} 325}
319 326
327=item cf::get_slot $time[, $priority[, $name]]
328
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $SLOT_QUEUE;
342
343$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async {
345 my $signal = new Coro::Signal;
346
347 while () {
348 next_job:
349 my $avail = cf::till_tick;
350 if ($avail > 0.01) {
351 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) {
353 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send;
355 Coro::cede;
356 goto next_job;
357 }
358 }
359 }
360
361 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait;
365 } else {
366 Coro::schedule;
367 }
368 }
369};
370
371sub get_slot($;$$) {
372 my ($time, $pri, $name) = @_;
373
374 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal;
376
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready;
380 $sig->wait;
381}
382
320=item cf::async { BLOCK } 383=item cf::async { BLOCK }
321 384
322Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
323C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 386C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324thing you are allowed to do is call C<prio> on it. 387thing you are allowed to do is call C<prio> on it.
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 472Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 473never block itself or use any form of Event handling.
411 474
412=cut 475=cut
413 476
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
414sub fork_call(&@) { 486sub fork_call(&@) {
415 my ($cb, @args) = @_; 487 my ($cb, @args) = @_;
416 488
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
418# or die "socketpair: $!"; 490# or die "socketpair: $!";
… …
433 return wantarray ? @$res : $res->[-1]; 505 return wantarray ? @$res : $res->[-1];
434 } else { 506 } else {
435 reset_signals; 507 reset_signals;
436 local $SIG{__WARN__}; 508 local $SIG{__WARN__};
437 local $SIG{__DIE__}; 509 local $SIG{__DIE__};
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.
438 local $Coro::idle; 513 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX); 514 $Coro::current->prio (Coro::PRIO_MAX);
515
440 eval { 516 eval {
441 close $fh1; 517 close $fh1;
442 518
443 my @res = eval { $cb->(@args) }; 519 my @res = eval { $cb->(@args) };
444 520
445 open my $fh, ">", \my $buf 521 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; 522 close $fh2;
455 }; 523 };
456 524
457 warn $@ if $@; 525 warn $@ if $@;
458 _exit 0; 526 _exit 0;
… …
860 "; 928 ";
861 die if $@; 929 die if $@;
862} 930}
863 931
864our $override; 932our $override;
865our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 933our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
866 934
867sub override { 935sub override {
868 $override = 1; 936 $override = 1;
869 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
870} 938}
871 939
872sub do_invoke { 940sub do_invoke {
873 my $event = shift; 941 my $event = shift;
874 my $callbacks = shift; 942 my $callbacks = shift;
875 943
876 @invoke_results = (); 944 @INVOKE_RESULTS = ();
877 945
878 local $override; 946 local $override;
879 947
880 for (@$callbacks) { 948 for (@$callbacks) {
881 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
898 966
899Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
900 968
901This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 969This 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 970removed in future versions), and there is no public API to access override
903results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 972
905=back 973=back
906 974
907=cut 975=cut
908 976
909############################################################################# 977#############################################################################
910# object support 978# object support
979#
980
981sub _can_merge {
982 my ($ob1, $ob2) = @_;
983
984 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2
989}
911 990
912sub reattach { 991sub reattach {
913 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 993 my ($obj) = @_;
915 994
… …
1483 my ($path) = @_; 1562 my ($path) = @_;
1484 1563
1485 my ($match, $specificity); 1564 my ($match, $specificity);
1486 1565
1487 for my $region (list) { 1566 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1567 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1568 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1569 if $region->specificity > $specificity;
1491 } 1570 }
1492 } 1571 }
1493 1572
… …
1613 $self->init; # pass $1 etc. 1692 $self->init; # pass $1 etc.
1614 return $self; 1693 return $self;
1615 } 1694 }
1616 } 1695 }
1617 1696
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1697 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1698 ()
1620} 1699}
1621 1700
1622sub init { 1701sub init {
1623 my ($self) = @_; 1702 my ($self) = @_;
… …
1901 1980
1902 undef $MAP_PREFETCH{$path}; 1981 undef $MAP_PREFETCH{$path};
1903 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 1984 for my $path (keys %MAP_PREFETCH) {
1906 my $map = find $path 1985 if (my $map = find $path) {
1907 or next;
1908 $map->load; 1986 $map->load;
1987 }
1909 1988
1910 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$path};
1911 } 1990 }
1912 } 1991 }
1913 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
… …
2250 2329
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2331 $self->enter_map ($map, $x, $y);
2253} 2332}
2254 2333
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2334=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2335
2257Moves the player to the given map-path and coordinates by first freezing 2336Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2337her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2338that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2339the new (success) or old (failed) map position. In either case, $done will
2340be called at the end of this process.
2261 2341
2262=cut 2342=cut
2263 2343
2264our $GOTOGEN; 2344our $GOTOGEN;
2265 2345
2266sub cf::object::player::goto { 2346sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2347 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2348
2269 # do generation counting so two concurrent goto's will be executed in-order 2349 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2351
2272 $self->enter_link; 2352 $self->enter_link;
… …
2292 2372
2293 if ($gen == $self->{_goto_generation}) { 2373 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2374 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2375 $self->leave_link ($map, $x, $y);
2296 } 2376 }
2377
2378 $done->() if $done;
2297 })->prio (1); 2379 })->prio (1);
2298} 2380}
2299 2381
2300=item $player_object->enter_exit ($exit_object) 2382=item $player_object->enter_exit ($exit_object)
2301 2383
… …
2410 2492
2411 utf8::encode $text; 2493 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2494 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2495}
2414 2496
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2497=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2498
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2499Send 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 2500client 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 2501the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2502the message unless the client supports the msg packet.
2421 2503
2422=cut 2504=cut
2423 2505
2424sub cf::client::send_msg { 2506sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2507 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2508
2427 $msg = $self->pl->expand_cfpod ($msg); 2509 $msg = $self->pl->expand_cfpod ($msg);
2428 2510
2511 $color &= ~cf::NDI_UNIQUE; # just in case...
2512
2513 if (ref $channel) {
2514 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel);
2518 }
2519
2520 $channel = $channel->{id};
2521 }
2522
2429 return unless @extra || length $msg; 2523 return unless @extra || length $msg;
2430 2524
2431 if ($self->can_msg) { 2525 if ($self->can_msg) {
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2433 } else { 2527 } else {
2434 # replace some tags by gcfclient-compatible ones 2528 # replace some tags by gcfclient-compatible ones
2435 for ($msg) { 2529 for ($msg) {
2436 1 while 2530 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2458 2552
2459=cut 2553=cut
2460 2554
2461sub cf::client::ext_event($$%) { 2555sub cf::client::ext_event($$%) {
2462 my ($self, $type, %msg) = @_; 2556 my ($self, $type, %msg) = @_;
2557
2558 return unless $self->extcmd;
2463 2559
2464 $msg{msgtype} = "event_$type"; 2560 $msg{msgtype} = "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2466} 2562}
2467 2563
… …
2714 { 2810 {
2715 my $faces = $facedata->{faceinfo}; 2811 my $faces = $facedata->{faceinfo};
2716 2812
2717 while (my ($face, $info) = each %$faces) { 2813 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2814 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2815 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2722 Coro::cede; 2819
2820 cf::cede_to_tick;
2723 } 2821 }
2724 2822
2725 while (my ($face, $info) = each %$faces) { 2823 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2824 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2825 my $idx = cf::face::find $face
2728 or next; 2826 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2827 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2830 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2831 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2832 }
2734 Coro::cede; 2833
2834 cf::cede_to_tick;
2735 } 2835 }
2736 } 2836 }
2737 2837
2738 { 2838 {
2739 my $anims = $facedata->{animinfo}; 2839 my $anims = $facedata->{animinfo};
2740 2840
2741 while (my ($anim, $info) = each %$anims) { 2841 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2842 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2843 cf::cede_to_tick;
2744 } 2844 }
2745 2845
2746 cf::anim::invalidate_all; # d'oh 2846 cf::anim::invalidate_all; # d'oh
2847 }
2848
2849 {
2850 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854
2855 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2863
2864 if ($name =~ /\.jpg$/) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2867 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 }
2874
2875 cf::cede_to_tick;
2876 }
2747 } 2877 }
2748 2878
2749 1 2879 1
2750} 2880}
2751 2881
2752sub reload_regions { 2882sub reload_regions {
2753 load_resource_file "$MAPDIR/regions" 2883 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 2884 or die "unable to load regions file\n";
2885
2886 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/
2888 if exists $_->{match};
2889 }
2755} 2890}
2756 2891
2757sub reload_facedata { 2892sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 2893 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 2894 or die "unable to load facedata\n";

Diff Legend

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