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.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: $!";
… …
421 493
422 if (my $pid = fork) { 494 if (my $pid = fork) {
423 close $fh2; 495 close $fh2;
424 496
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
426 $res = Coro::Storable::thaw $res; 499 $res = Coro::Storable::thaw $res;
427 500
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429 502
430 die $$res unless "ARRAY" eq ref $res; 503 Carp::confess $$res unless "ARRAY" eq ref $res;
431 504
432 return wantarray ? @$res : $res->[-1]; 505 return wantarray ? @$res : $res->[-1];
433 } else { 506 } else {
434 reset_signals; 507 reset_signals;
435 local $SIG{__WARN__}; 508 local $SIG{__WARN__};
436 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.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515
437 eval { 516 eval {
438 close $fh1; 517 close $fh1;
439 518
440 my @res = eval { $cb->(@args) }; 519 my @res = eval { $cb->(@args) };
520
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
442 }; 523 };
443 524
444 warn $@ if $@; 525 warn $@ if $@;
445 _exit 0; 526 _exit 0;
446 } 527 }
… …
847 "; 928 ";
848 die if $@; 929 die if $@;
849} 930}
850 931
851our $override; 932our $override;
852our @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?
853 934
854sub override { 935sub override {
855 $override = 1; 936 $override = 1;
856 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
857} 938}
858 939
859sub do_invoke { 940sub do_invoke {
860 my $event = shift; 941 my $event = shift;
861 my $callbacks = shift; 942 my $callbacks = shift;
862 943
863 @invoke_results = (); 944 @INVOKE_RESULTS = ();
864 945
865 local $override; 946 local $override;
866 947
867 for (@$callbacks) { 948 for (@$callbacks) {
868 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
885 966
886Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
887 968
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 972
892=back 973=back
893 974
894=cut 975=cut
895 976
896############################################################################# 977#############################################################################
897# 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}
898 990
899sub reattach { 991sub reattach {
900 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 993 my ($obj) = @_;
902 994
… …
1412 1504
1413 # create single paragraphs (very hackish) 1505 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1506 s/(?<=\S)\n(?=\w)/ /g;
1415 1507
1416 # compress some whitespace 1508 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1509 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines
1418 1513
1419 $_ 1514 $_
1420} 1515}
1421 1516
1422sub hintmode { 1517sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1518 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1519 $_[0]{hintmode}
1426} 1520}
1427 1521
1428=item $player->ext_reply ($msgid, %msg) 1522=item $player->ext_reply ($msgid, %msg)
… …
1468 my ($path) = @_; 1562 my ($path) = @_;
1469 1563
1470 my ($match, $specificity); 1564 my ($match, $specificity);
1471 1565
1472 for my $region (list) { 1566 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1567 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1568 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1569 if $region->specificity > $specificity;
1476 } 1570 }
1477 } 1571 }
1478 1572
… …
1598 $self->init; # pass $1 etc. 1692 $self->init; # pass $1 etc.
1599 return $self; 1693 return $self;
1600 } 1694 }
1601 } 1695 }
1602 1696
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1697 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1698 ()
1605} 1699}
1606 1700
1607sub init { 1701sub init {
1608 my ($self) = @_; 1702 my ($self) = @_;
… …
1886 1980
1887 undef $MAP_PREFETCH{$path}; 1981 undef $MAP_PREFETCH{$path};
1888 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1889 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 1984 for my $path (keys %MAP_PREFETCH) {
1891 my $map = find $path 1985 if (my $map = find $path) {
1892 or next;
1893 $map->load; 1986 $map->load;
1987 }
1894 1988
1895 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$path};
1896 } 1990 }
1897 } 1991 }
1898 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
… …
2235 2329
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2331 $self->enter_map ($map, $x, $y);
2238} 2332}
2239 2333
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2334=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2335
2242Moves 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
2243her, loading and preparing them map, calling the provided $check callback 2337her, loading and preparing them map, calling the provided $check callback
2244that 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
2245the 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.
2246 2341
2247=cut 2342=cut
2248 2343
2249our $GOTOGEN; 2344our $GOTOGEN;
2250 2345
2251sub cf::object::player::goto { 2346sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2347 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2348
2254 # 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
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2351
2257 $self->enter_link; 2352 $self->enter_link;
… …
2277 2372
2278 if ($gen == $self->{_goto_generation}) { 2373 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2374 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2375 $self->leave_link ($map, $x, $y);
2281 } 2376 }
2377
2378 $done->() if $done;
2282 })->prio (1); 2379 })->prio (1);
2283} 2380}
2284 2381
2285=item $player_object->enter_exit ($exit_object) 2382=item $player_object->enter_exit ($exit_object)
2286 2383
… …
2355 my $hp = $exit->stats->hp; 2452 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2453 my $sp = $exit->stats->sp;
2357 2454
2358 $self->enter_link; 2455 $self->enter_link;
2359 2456
2457 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED);
2460
2360 (async { 2461 (async {
2361 $self->deactivate_recursive; # just to be sure 2462 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2463 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2464 $self->goto ($slaying, $hp, $sp);
2364 2465
… …
2391 2492
2392 utf8::encode $text; 2493 utf8::encode $text;
2393 $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);
2394} 2495}
2395 2496
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2497=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2498
2398Send 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
2399client 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
2400the 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
2401the message unless the client supports the msg packet. 2502the message unless the client supports the msg packet.
2402 2503
2403=cut 2504=cut
2404 2505
2405sub cf::client::send_msg { 2506sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2507 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2508
2408 $msg = $self->pl->expand_cfpod ($msg); 2509 $msg = $self->pl->expand_cfpod ($msg);
2409 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
2523 return unless @extra || length $msg;
2524
2410 if ($self->can_msg) { 2525 if ($self->can_msg) {
2411 $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]));
2412 } else { 2527 } else {
2413 # replace some tags by gcfclient-compatible ones 2528 # replace some tags by gcfclient-compatible ones
2414 for ($msg) { 2529 for ($msg) {
2415 1 while 2530 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2438=cut 2553=cut
2439 2554
2440sub cf::client::ext_event($$%) { 2555sub cf::client::ext_event($$%) {
2441 my ($self, $type, %msg) = @_; 2556 my ($self, $type, %msg) = @_;
2442 2557
2558 return unless $self->extcmd;
2559
2443 $msg{msgtype} = "event_$type"; 2560 $msg{msgtype} = "event_$type";
2444 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2445} 2562}
2446 2563
2447=item $success = $client->query ($flags, "text", \&cb) 2564=item $success = $client->query ($flags, "text", \&cb)
… …
2574 2691
2575=pod 2692=pod
2576 2693
2577The following functions and methods are available within a safe environment: 2694The following functions and methods are available within a safe environment:
2578 2695
2579 cf::object contr pay_amount pay_player map 2696 cf::object
2697 contr pay_amount pay_player map x y force_find force_add
2698 insert remove
2699
2580 cf::object::player player 2700 cf::object::player
2581 cf::player peaceful 2701 player
2582 cf::map trigger 2702
2703 cf::player
2704 peaceful
2705
2706 cf::map
2707 trigger
2583 2708
2584=cut 2709=cut
2585 2710
2586for ( 2711for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)],
2588 ["cf::object::player" => qw(player)], 2714 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 2715 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 2716 ["cf::map" => qw(trigger)],
2591) { 2717) {
2592 no strict 'refs'; 2718 no strict 'refs';
… …
2684 { 2810 {
2685 my $faces = $facedata->{faceinfo}; 2811 my $faces = $facedata->{faceinfo};
2686 2812
2687 while (my ($face, $info) = each %$faces) { 2813 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2814 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2815 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2692 Coro::cede; 2819
2820 cf::cede_to_tick;
2693 } 2821 }
2694 2822
2695 while (my ($face, $info) = each %$faces) { 2823 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 2824 next unless $info->{smooth};
2697 my $idx = cf::face::find $face 2825 my $idx = cf::face::find $face
2698 or next; 2826 or next;
2699 if (my $smooth = cf::face::find $info->{smooth}) { 2827 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 2830 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2831 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 2832 }
2704 Coro::cede; 2833
2834 cf::cede_to_tick;
2705 } 2835 }
2706 } 2836 }
2707 2837
2708 { 2838 {
2709 my $anims = $facedata->{animinfo}; 2839 my $anims = $facedata->{animinfo};
2710 2840
2711 while (my ($anim, $info) = each %$anims) { 2841 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2842 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 2843 cf::cede_to_tick;
2714 } 2844 }
2715 2845
2716 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 }
2717 } 2877 }
2718 2878
2719 1 2879 1
2720} 2880}
2721 2881
2722sub reload_regions { 2882sub reload_regions {
2723 load_resource_file "$MAPDIR/regions" 2883 load_resource_file "$MAPDIR/regions"
2724 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 }
2725} 2890}
2726 2891
2727sub reload_facedata { 2892sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 2893 load_facedata "$DATADIR/facedata"
2729 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