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.303 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.315 by root, Mon Jul 23 17:53:55 2007 UTC

… …
166=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
167 167
168These 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
169returns 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
170per 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.
171 177
172=back 178=back
173 179
174=cut 180=cut
175 181
… …
316 }; 322 };
317 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
318 $guard 324 $guard
319} 325}
320 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
321=item cf::async { BLOCK } 383=item cf::async { BLOCK }
322 384
323Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
324C<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
325thing you are allowed to do is call C<prio> on it. 387thing you are allowed to do is call C<prio> on it.
… …
866 "; 928 ";
867 die if $@; 929 die if $@;
868} 930}
869 931
870our $override; 932our $override;
871our @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?
872 934
873sub override { 935sub override {
874 $override = 1; 936 $override = 1;
875 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
876} 938}
877 939
878sub do_invoke { 940sub do_invoke {
879 my $event = shift; 941 my $event = shift;
880 my $callbacks = shift; 942 my $callbacks = shift;
881 943
882 @invoke_results = (); 944 @INVOKE_RESULTS = ();
883 945
884 local $override; 946 local $override;
885 947
886 for (@$callbacks) { 948 for (@$callbacks) {
887 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
904 966
905Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
906 968
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 972
911=back 973=back
912 974
913=cut 975=cut
914 976
915############################################################################# 977#############################################################################
916# 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}
917 990
918sub reattach { 991sub reattach {
919 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 993 my ($obj) = @_;
921 994
… …
1489 my ($path) = @_; 1562 my ($path) = @_;
1490 1563
1491 my ($match, $specificity); 1564 my ($match, $specificity);
1492 1565
1493 for my $region (list) { 1566 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1567 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1568 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1569 if $region->specificity > $specificity;
1497 } 1570 }
1498 } 1571 }
1499 1572
… …
1619 $self->init; # pass $1 etc. 1692 $self->init; # pass $1 etc.
1620 return $self; 1693 return $self;
1621 } 1694 }
1622 } 1695 }
1623 1696
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1697 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1698 ()
1626} 1699}
1627 1700
1628sub init { 1701sub init {
1629 my ($self) = @_; 1702 my ($self) = @_;
… …
1907 1980
1908 undef $MAP_PREFETCH{$path}; 1981 undef $MAP_PREFETCH{$path};
1909 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 1984 for my $path (keys %MAP_PREFETCH) {
1912 my $map = find $path 1985 if (my $map = find $path) {
1913 or next;
1914 $map->load; 1986 $map->load;
1987 }
1915 1988
1916 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$path};
1917 } 1990 }
1918 } 1991 }
1919 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
… …
2256 2329
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2331 $self->enter_map ($map, $x, $y);
2259} 2332}
2260 2333
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2334=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2335
2263Moves 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
2264her, loading and preparing them map, calling the provided $check callback 2337her, loading and preparing them map, calling the provided $check callback
2265that 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
2266the 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.
2267 2341
2268=cut 2342=cut
2269 2343
2270our $GOTOGEN; 2344our $GOTOGEN;
2271 2345
2272sub cf::object::player::goto { 2346sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2347 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2348
2275 # 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
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2351
2278 $self->enter_link; 2352 $self->enter_link;
… …
2298 2372
2299 if ($gen == $self->{_goto_generation}) { 2373 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2374 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2375 $self->leave_link ($map, $x, $y);
2302 } 2376 }
2377
2378 $done->() if $done;
2303 })->prio (1); 2379 })->prio (1);
2304} 2380}
2305 2381
2306=item $player_object->enter_exit ($exit_object) 2382=item $player_object->enter_exit ($exit_object)
2307 2383
… …
2416 2492
2417 utf8::encode $text; 2493 utf8::encode $text;
2418 $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);
2419} 2495}
2420 2496
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2497=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2498
2423Send 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
2424client 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
2425the 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
2426the message unless the client supports the msg packet. 2502the message unless the client supports the msg packet.
2427 2503
2428=cut 2504=cut
2429 2505
2430sub cf::client::send_msg { 2506sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2507 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2508
2433 $msg = $self->pl->expand_cfpod ($msg); 2509 $msg = $self->pl->expand_cfpod ($msg);
2434 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
2435 return unless @extra || length $msg; 2523 return unless @extra || length $msg;
2436 2524
2437 if ($self->can_msg) { 2525 if ($self->can_msg) {
2438 $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]));
2439 } else { 2527 } else {
2440 # replace some tags by gcfclient-compatible ones 2528 # replace some tags by gcfclient-compatible ones
2441 for ($msg) { 2529 for ($msg) {
2442 1 while 2530 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2464 2552
2465=cut 2553=cut
2466 2554
2467sub cf::client::ext_event($$%) { 2555sub cf::client::ext_event($$%) {
2468 my ($self, $type, %msg) = @_; 2556 my ($self, $type, %msg) = @_;
2557
2558 return unless $self->extcmd;
2469 2559
2470 $msg{msgtype} = "event_$type"; 2560 $msg{msgtype} = "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2472} 2562}
2473 2563
… …
2766 my $meta = $enc->encode ({ 2856 my $meta = $enc->encode ({
2767 name => $name, 2857 name => $name,
2768 type => $info->{type}, 2858 type => $info->{type},
2769 copyright => $info->{copyright}, #TODO# 2859 copyright => $info->{copyright}, #TODO#
2770 }); 2860 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773 2861
2774 my $idx = (cf::face::find $name) || cf::face::alloc $name; 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
2775 cf::face::set_type $idx, 1; 2871 cf::face::set_type $idx, 1;
2776 cf::face::set_data $idx, 0, $data, $chk; 2872 cf::face::set_data $idx, 0, $data, $chk;
2873 }
2777 2874
2778 cf::cede_to_tick; 2875 cf::cede_to_tick;
2779 } 2876 }
2780 } 2877 }
2781 2878
… …
2783} 2880}
2784 2881
2785sub reload_regions { 2882sub reload_regions {
2786 load_resource_file "$MAPDIR/regions" 2883 load_resource_file "$MAPDIR/regions"
2787 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 }
2788} 2890}
2789 2891
2790sub reload_facedata { 2892sub reload_facedata {
2791 load_facedata "$DATADIR/facedata" 2893 load_facedata "$DATADIR/facedata"
2792 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