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.314 by root, Mon Jul 23 16:53:15 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]
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
333Useful for short background jobs.
334
335=cut
336
337our @SLOT_QUEUE;
338our $SLOT_QUEUE;
339
340$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async {
342 my $signal = new Coro::Signal;
343
344 while () {
345 next_job:
346 my $avail = cf::till_tick;
347 if ($avail > 0.01) {
348 for (0 .. $#SLOT_QUEUE) {
349 if ($SLOT_QUEUE[$_][0] < $avail) {
350 my $job = splice @SLOT_QUEUE, $_, 1, ();
351 $job->[2]->send;
352 Coro::cede;
353 goto next_job;
354 }
355 }
356 }
357
358 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait;
362 } else {
363 Coro::schedule;
364 }
365 }
366};
367
368sub get_slot($;$) {
369 my ($time, $pri) = @_;
370
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready;
374 $sig->wait;
375}
376
320=item cf::async { BLOCK } 377=item cf::async { BLOCK }
321 378
322Currently the same as Coro::async_pool, meaning you cannot use 379Currently the same as Coro::async_pool, meaning you cannot use
323C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 380C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324thing you are allowed to do is call C<prio> on it. 381thing you are allowed to do is call C<prio> on it.
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 466Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 467never block itself or use any form of Event handling.
411 468
412=cut 469=cut
413 470
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
414sub fork_call(&@) { 480sub fork_call(&@) {
415 my ($cb, @args) = @_; 481 my ($cb, @args) = @_;
416 482
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
418# or die "socketpair: $!"; 484# or die "socketpair: $!";
… …
421 487
422 if (my $pid = fork) { 488 if (my $pid = fork) {
423 close $fh2; 489 close $fh2;
424 490
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
426 $res = Coro::Storable::thaw $res; 493 $res = Coro::Storable::thaw $res;
427 494
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429 496
430 die $$res unless "ARRAY" eq ref $res; 497 Carp::confess $$res unless "ARRAY" eq ref $res;
431 498
432 return wantarray ? @$res : $res->[-1]; 499 return wantarray ? @$res : $res->[-1];
433 } else { 500 } else {
434 reset_signals; 501 reset_signals;
435 local $SIG{__WARN__}; 502 local $SIG{__WARN__};
436 local $SIG{__DIE__}; 503 local $SIG{__DIE__};
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509
437 eval { 510 eval {
438 close $fh1; 511 close $fh1;
439 512
440 my @res = eval { $cb->(@args) }; 513 my @res = eval { $cb->(@args) };
514
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
442 }; 517 };
443 518
444 warn $@ if $@; 519 warn $@ if $@;
445 _exit 0; 520 _exit 0;
446 } 521 }
… …
847 "; 922 ";
848 die if $@; 923 die if $@;
849} 924}
850 925
851our $override; 926our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 927our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 928
854sub override { 929sub override {
855 $override = 1; 930 $override = 1;
856 @invoke_results = (); 931 @INVOKE_RESULTS = (@_);
857} 932}
858 933
859sub do_invoke { 934sub do_invoke {
860 my $event = shift; 935 my $event = shift;
861 my $callbacks = shift; 936 my $callbacks = shift;
862 937
863 @invoke_results = (); 938 @INVOKE_RESULTS = ();
864 939
865 local $override; 940 local $override;
866 941
867 for (@$callbacks) { 942 for (@$callbacks) {
868 eval { &{$_->[1]} }; 943 eval { &{$_->[1]} };
… …
885 960
886Generate an object-specific event with the given arguments. 961Generate an object-specific event with the given arguments.
887 962
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 963This 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 964removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 965results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 966
892=back 967=back
893 968
894=cut 969=cut
895 970
896############################################################################# 971#############################################################################
897# object support 972# object support
973#
974
975sub _can_merge {
976 my ($ob1, $ob2) = @_;
977
978 local $Storable::canonical = 1;
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981
982 $fob1 eq $fob2
983}
898 984
899sub reattach { 985sub reattach {
900 # basically do the same as instantiate, without calling instantiate 986 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 987 my ($obj) = @_;
902 988
… …
1412 1498
1413 # create single paragraphs (very hackish) 1499 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1500 s/(?<=\S)\n(?=\w)/ /g;
1415 1501
1416 # compress some whitespace 1502 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1503 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines
1418 1507
1419 $_ 1508 $_
1420} 1509}
1421 1510
1422sub hintmode { 1511sub hintmode {
… …
1467 my ($path) = @_; 1556 my ($path) = @_;
1468 1557
1469 my ($match, $specificity); 1558 my ($match, $specificity);
1470 1559
1471 for my $region (list) { 1560 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1561 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1562 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1563 if $region->specificity > $specificity;
1475 } 1564 }
1476 } 1565 }
1477 1566
… …
1597 $self->init; # pass $1 etc. 1686 $self->init; # pass $1 etc.
1598 return $self; 1687 return $self;
1599 } 1688 }
1600 } 1689 }
1601 1690
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1691 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1692 ()
1604} 1693}
1605 1694
1606sub init { 1695sub init {
1607 my ($self) = @_; 1696 my ($self) = @_;
… …
1885 1974
1886 undef $MAP_PREFETCH{$path}; 1975 undef $MAP_PREFETCH{$path};
1887 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1888 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 1978 for my $path (keys %MAP_PREFETCH) {
1890 my $map = find $path 1979 if (my $map = find $path) {
1891 or next;
1892 $map->load; 1980 $map->load;
1981 }
1893 1982
1894 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$path};
1895 } 1984 }
1896 } 1985 }
1897 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
… …
2234 2323
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
2237} 2326}
2238 2327
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2329
2241Moves the player to the given map-path and coordinates by first freezing 2330Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2331her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2332that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2333the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process.
2245 2335
2246=cut 2336=cut
2247 2337
2248our $GOTOGEN; 2338our $GOTOGEN;
2249 2339
2250sub cf::object::player::goto { 2340sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2341 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2342
2253 # do generation counting so two concurrent goto's will be executed in-order 2343 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2345
2256 $self->enter_link; 2346 $self->enter_link;
… …
2276 2366
2277 if ($gen == $self->{_goto_generation}) { 2367 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2368 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2280 } 2370 }
2371
2372 $done->() if $done;
2281 })->prio (1); 2373 })->prio (1);
2282} 2374}
2283 2375
2284=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
2285 2377
… …
2354 my $hp = $exit->stats->hp; 2446 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp; 2447 my $sp = $exit->stats->sp;
2356 2448
2357 $self->enter_link; 2449 $self->enter_link;
2358 2450
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2359 (async { 2455 (async {
2360 $self->deactivate_recursive; # just to be sure 2456 $self->deactivate_recursive; # just to be sure
2361 unless (eval { 2457 unless (eval {
2362 $self->goto ($slaying, $hp, $sp); 2458 $self->goto ($slaying, $hp, $sp);
2363 2459
… …
2390 2486
2391 utf8::encode $text; 2487 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2488 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2489}
2394 2490
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2492
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2493Send 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 2494client 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 2495the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2496the message unless the client supports the msg packet.
2401 2497
2402=cut 2498=cut
2403 2499
2404sub cf::client::send_msg { 2500sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2501 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2502
2407 $msg = $self->pl->expand_cfpod ($msg); 2503 $msg = $self->pl->expand_cfpod ($msg);
2408 2504
2505 $color &= ~cf::NDI_UNIQUE; # just in case...
2506
2507 if (ref $channel) {
2508 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel);
2512 }
2513
2514 $channel = $channel->{id};
2515 }
2516
2517 return unless @extra || length $msg;
2518
2409 if ($self->can_msg) { 2519 if ($self->can_msg) {
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2411 } else { 2521 } else {
2412 # replace some tags by gcfclient-compatible ones 2522 # replace some tags by gcfclient-compatible ones
2413 for ($msg) { 2523 for ($msg) {
2414 1 while 2524 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2437=cut 2547=cut
2438 2548
2439sub cf::client::ext_event($$%) { 2549sub cf::client::ext_event($$%) {
2440 my ($self, $type, %msg) = @_; 2550 my ($self, $type, %msg) = @_;
2441 2551
2552 return unless $self->extcmd;
2553
2442 $msg{msgtype} = "event_$type"; 2554 $msg{msgtype} = "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2444} 2556}
2445 2557
2446=item $success = $client->query ($flags, "text", \&cb) 2558=item $success = $client->query ($flags, "text", \&cb)
… …
2573 2685
2574=pod 2686=pod
2575 2687
2576The following functions and methods are available within a safe environment: 2688The following functions and methods are available within a safe environment:
2577 2689
2578 cf::object contr pay_amount pay_player map 2690 cf::object
2691 contr pay_amount pay_player map x y force_find force_add
2692 insert remove
2693
2579 cf::object::player player 2694 cf::object::player
2580 cf::player peaceful 2695 player
2581 cf::map trigger 2696
2697 cf::player
2698 peaceful
2699
2700 cf::map
2701 trigger
2582 2702
2583=cut 2703=cut
2584 2704
2585for ( 2705for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)],
2587 ["cf::object::player" => qw(player)], 2708 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 2709 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 2710 ["cf::map" => qw(trigger)],
2590) { 2711) {
2591 no strict 'refs'; 2712 no strict 'refs';
… …
2683 { 2804 {
2684 my $faces = $facedata->{faceinfo}; 2805 my $faces = $facedata->{faceinfo};
2685 2806
2686 while (my ($face, $info) = each %$faces) { 2807 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2808 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2809 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2691 Coro::cede; 2813
2814 cf::cede_to_tick;
2692 } 2815 }
2693 2816
2694 while (my ($face, $info) = each %$faces) { 2817 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 2818 next unless $info->{smooth};
2696 my $idx = cf::face::find $face 2819 my $idx = cf::face::find $face
2697 or next; 2820 or next;
2698 if (my $smooth = cf::face::find $info->{smooth}) { 2821 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 2824 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2825 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 2826 }
2703 Coro::cede; 2827
2828 cf::cede_to_tick;
2704 } 2829 }
2705 } 2830 }
2706 2831
2707 { 2832 {
2708 my $anims = $facedata->{animinfo}; 2833 my $anims = $facedata->{animinfo};
2709 2834
2710 while (my ($anim, $info) = each %$anims) { 2835 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2836 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 2837 cf::cede_to_tick;
2713 } 2838 }
2714 2839
2715 cf::anim::invalidate_all; # d'oh 2840 cf::anim::invalidate_all; # d'oh
2841 }
2842
2843 {
2844 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848
2849 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2857
2858 if ($name =~ /\.jpg$/) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2861 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 }
2868
2869 cf::cede_to_tick;
2870 }
2716 } 2871 }
2717 2872
2718 1 2873 1
2719} 2874}
2720 2875
2721sub reload_regions { 2876sub reload_regions {
2722 load_resource_file "$MAPDIR/regions" 2877 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 2878 or die "unable to load regions file\n";
2879
2880 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/
2882 if exists $_->{match};
2883 }
2724} 2884}
2725 2885
2726sub reload_facedata { 2886sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 2887 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 2888 or die "unable to load facedata\n";

Diff Legend

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