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.318 by root, Tue Jul 24 04:55:34 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
… …
1108 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1109 1182
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1184
1112 if (ref $msg) { 1185 if (ref $msg) {
1186 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg
1188 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1115 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1116 } 1195 if $reply;
1117 } 1196 }
1118 } else { 1197 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1199 }
1121 1200
… …
1444sub hintmode { 1523sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1525 $_[0]{hintmode}
1447} 1526}
1448 1527
1449=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1450 1529
1451Sends an ext reply to the player. 1530Sends an ext reply to the player.
1452 1531
1453=cut 1532=cut
1454 1533
1455sub ext_reply($$%) { 1534sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1457 1536
1458 $msg{msgid} = $id; 1537 if ($self->ns->extcmd == 2) {
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1460} 1544}
1461 1545
1462=item $player->ext_event ($type, %msg) 1546=item $player->ext_msg ($type, @msg)
1463 1547
1464Sends an ext event to the client. 1548Sends an ext event to the client.
1465 1549
1466=cut 1550=cut
1467 1551
1468sub ext_event($$%) { 1552sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1553 my ($self, $type, @msg) = @_;
1470 1554
1471 $self->ns->ext_event ($type, %msg); 1555 $self->ns->ext_msg ($type, @msg);
1472} 1556}
1473 1557
1474=head3 cf::region 1558=head3 cf::region
1475 1559
1476=over 4 1560=over 4
… …
1489 my ($path) = @_; 1573 my ($path) = @_;
1490 1574
1491 my ($match, $specificity); 1575 my ($match, $specificity);
1492 1576
1493 for my $region (list) { 1577 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1578 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1579 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1580 if $region->specificity > $specificity;
1497 } 1581 }
1498 } 1582 }
1499 1583
… …
1619 $self->init; # pass $1 etc. 1703 $self->init; # pass $1 etc.
1620 return $self; 1704 return $self;
1621 } 1705 }
1622 } 1706 }
1623 1707
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1708 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1709 ()
1626} 1710}
1627 1711
1628sub init { 1712sub init {
1629 my ($self) = @_; 1713 my ($self) = @_;
… …
1907 1991
1908 undef $MAP_PREFETCH{$path}; 1992 undef $MAP_PREFETCH{$path};
1909 $MAP_PREFETCHER ||= cf::async { 1993 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 1994 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 1995 for my $path (keys %MAP_PREFETCH) {
1912 my $map = find $path 1996 if (my $map = find $path) {
1913 or next;
1914 $map->load; 1997 $map->load;
1998 }
1915 1999
1916 delete $MAP_PREFETCH{$path}; 2000 delete $MAP_PREFETCH{$path};
1917 } 2001 }
1918 } 2002 }
1919 undef $MAP_PREFETCHER; 2003 undef $MAP_PREFETCHER;
… …
2146 2230
2147 } else { 2231 } else {
2148 my $pl = $self->contr; 2232 my $pl = $self->contr;
2149 2233
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2234 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2235 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2237
2159 } else { 2238 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2239 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2240 $self->message ($msg, $flags);
2162 } 2241 }
… …
2256 2335
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2337 $self->enter_map ($map, $x, $y);
2259} 2338}
2260 2339
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2340=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2341
2263Moves the player to the given map-path and coordinates by first freezing 2342Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2343her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2344that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2345the new (success) or old (failed) map position. In either case, $done will
2346be called at the end of this process.
2267 2347
2268=cut 2348=cut
2269 2349
2270our $GOTOGEN; 2350our $GOTOGEN;
2271 2351
2272sub cf::object::player::goto { 2352sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2353 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2354
2275 # do generation counting so two concurrent goto's will be executed in-order 2355 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2357
2278 $self->enter_link; 2358 $self->enter_link;
… …
2298 2378
2299 if ($gen == $self->{_goto_generation}) { 2379 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2380 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2381 $self->leave_link ($map, $x, $y);
2302 } 2382 }
2383
2384 $done->() if $done;
2303 })->prio (1); 2385 })->prio (1);
2304} 2386}
2305 2387
2306=item $player_object->enter_exit ($exit_object) 2388=item $player_object->enter_exit ($exit_object)
2307 2389
… …
2416 2498
2417 utf8::encode $text; 2499 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2500 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2501}
2420 2502
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2503=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2504
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2505Send 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 2506client 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 2507the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2508the message unless the client supports the msg packet.
2427 2509
2428=cut 2510=cut
2429 2511
2430sub cf::client::send_msg { 2512sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2513 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2514
2433 $msg = $self->pl->expand_cfpod ($msg); 2515 $msg = $self->pl->expand_cfpod ($msg);
2434 2516
2517 $color &= ~cf::NDI_UNIQUE; # just in case...
2518
2519 if (ref $channel) {
2520 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel);
2524 }
2525
2526 $channel = $channel->{id};
2527 }
2528
2435 return unless @extra || length $msg; 2529 return unless @extra || length $msg;
2436 2530
2437 if ($self->can_msg) { 2531 if ($self->can_msg) {
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2439 } else { 2533 } else {
2440 # replace some tags by gcfclient-compatible ones 2534 # replace some tags by gcfclient-compatible ones
2441 for ($msg) { 2535 for ($msg) {
2442 1 while 2536 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2456 } 2550 }
2457 } 2551 }
2458 } 2552 }
2459} 2553}
2460 2554
2461=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2462 2556
2463Sends an ext event to the client. 2557Sends an ext event to the client.
2464 2558
2465=cut 2559=cut
2466 2560
2467sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2469 2563
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2569 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 }
2472} 2572}
2473 2573
2474=item $success = $client->query ($flags, "text", \&cb) 2574=item $success = $client->query ($flags, "text", \&cb)
2475 2575
2476Queues a query to the client, calling the given callback with 2576Queues a query to the client, calling the given callback with
… …
2531 my ($ns, $buf) = @_; 2631 my ($ns, $buf) = @_;
2532 2632
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2633 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2634
2535 if (ref $msg) { 2635 if (ref $msg) {
2636 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg
2638 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2641 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 2642 my @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid}; 2643
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2644 $ns->ext_reply ($reply, @reply)
2540 } 2645 if $reply;
2541 } 2646 }
2542 } else { 2647 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 2649 }
2545 2650
… …
2763 my $enc = JSON::XS->new->utf8->canonical; 2868 my $enc = JSON::XS->new->utf8->canonical;
2764 2869
2765 while (my ($name, $info) = each %$res) { 2870 while (my ($name, $info) = each %$res) {
2766 my $meta = $enc->encode ({ 2871 my $meta = $enc->encode ({
2767 name => $name, 2872 name => $name,
2768 type => $info->{type},
2769 copyright => $info->{copyright}, #TODO# 2873 copyright => $info->{copyright}, #TODO#
2770 }); 2874 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773 2875
2774 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2876 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2775 cf::face::set_type $idx, 1; 2877
2878 if ($info->{type} & 1) {
2879 # prepend meta info
2880
2881 my $data = pack "(w/a*)*", $meta, $info->{data};
2882 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2883
2776 cf::face::set_data $idx, 0, $data, $chk; 2884 cf::face::set_data $idx, 0, $data, $chk;
2885 } else {
2886 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2887 }
2888
2889 cf::face::set_type $idx, $info->{type};
2777 2890
2778 cf::cede_to_tick; 2891 cf::cede_to_tick;
2779 } 2892 }
2780 } 2893 }
2781 2894
2782 1 2895 1
2783} 2896}
2897
2898register_exticmd fx_want => sub {
2899 my ($ns, $want) = @_;
2900
2901 while (my ($k, $v) = each %$want) {
2902 $ns->fx_want ($k, $v);
2903 }
2904};
2784 2905
2785sub reload_regions { 2906sub reload_regions {
2786 load_resource_file "$MAPDIR/regions" 2907 load_resource_file "$MAPDIR/regions"
2787 or die "unable to load regions file\n"; 2908 or die "unable to load regions file\n";
2909
2910 for (cf::region::list) {
2911 $_->{match} = qr/$_->{match}/
2912 if exists $_->{match};
2913 }
2788} 2914}
2789 2915
2790sub reload_facedata { 2916sub reload_facedata {
2791 load_facedata "$DATADIR/facedata" 2917 load_facedata "$DATADIR/facedata"
2792 or die "unable to load facedata\n"; 2918 or die "unable to load facedata\n";

Diff Legend

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