[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.305 by root, Thu Jul 12 08:40:14 2007 UTC vs.
Revision 1.321 by root, Thu Jul 26 21:44:43 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
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169	returns directly I<after> the tick processing (and consequently, can only wake one process	169	returns directly I<after> the tick processing (and consequently, can only wake one process
170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		171
		172	=item @cf::INVOKE_RESULTS
		173
		174	This array contains the results of the last C<invoke ()> call. When
		175	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		176	that 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
		329	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		330	This call blocks and returns only when you have at least C<$time> seconds
		331	of cpu time till the next tick. The slot is only valid till the next cede.
		332
		333	The optional C<$name> can be used to identify the job to run. It might be
		334	used for statistical purposes and should identify the same time-class.
		335
		336	Useful for short background jobs.
		337
		338	=cut
		339
		340	our @SLOT_QUEUE;
		341	our $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
		371	sub 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
323	Currently the same as Coro::async_pool, meaning you cannot use	385	Currently the same as Coro::async_pool, meaning you cannot use
324	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	386	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
325	thing you are allowed to do is call C<prio> on it.	387	thing you are allowed to do is call C<prio> on it.
…		…
866	";	928	";
867	die if $@;	929	die if $@;
868	}	930	}
869		931
870	our $override;	932	our $override;
871	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	933	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872		934
873	sub override {	935	sub override {
874	$override = 1;	936	$override = 1;
875	@invoke_results = ();	937	@INVOKE_RESULTS = (@_);
876	}	938	}
877		939
878	sub do_invoke {	940	sub 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
905	Generate an object-specific event with the given arguments.	967	Generate an object-specific event with the given arguments.
906		968
907	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	969	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908	removed in future versions), and there is no public API to access override	970	removed in future versions), and there is no public API to access override
909	results (if you must, access C<@cf::invoke_results> directly).	971	results (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
		981	sub _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
918	sub reattach {	991	sub 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
…		…
1444	sub hintmode {	1523	sub 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
1451	Sends an ext reply to the player.	1530	Sends an ext reply to the player.
1452		1531
1453	=cut	1532	=cut
1454		1533
1455	sub ext_reply($$%) {	1534	sub 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
1464	Sends an ext event to the client.	1548	Sends an ext event to the client.
1465		1549
1466	=cut	1550	=cut
1467		1551
1468	sub ext_event($$%) {	1552	sub 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
…		…
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
1628	sub init {	1712	sub 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
2263	Moves the player to the given map-path and coordinates by first freezing	2342	Moves the player to the given map-path and coordinates by first freezing
2264	her, loading and preparing them map, calling the provided $check callback	2343	her, loading and preparing them map, calling the provided $check callback
2265	that has to return the map if sucecssful, and then unfreezes the player on	2344	that has to return the map if sucecssful, and then unfreezes the player on
2266	the new (success) or old (failed) map position.	2345	the new (success) or old (failed) map position. In either case, $done will
		2346	be called at the end of this process.
2267		2347
2268	=cut	2348	=cut
2269		2349
2270	our $GOTOGEN;	2350	our $GOTOGEN;
2271		2351
2272	sub cf::object::player::goto {	2352	sub 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
2423	Send a drawinfo or msg packet to the client, formatting the msg for the	2505	Send a drawinfo or msg packet to the client, formatting the msg for the
2424	client if neccessary. C<$type> should be a string identifying the type of	2506	client if neccessary. C<$type> should be a string identifying the type of
2425	the message, with C<log> being the default. If C<$color> is negative, suppress	2507	the message, with C<log> being the default. If C<$color> is negative, suppress
2426	the message unless the client supports the msg packet.	2508	the message unless the client supports the msg packet.
2427		2509
2428	=cut	2510	=cut
2429		2511
2430	sub cf::client::send_msg {	2512	sub 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
2463	Sends an ext event to the client.	2557	Sends an ext event to the client.
2464		2558
2465	=cut	2559	=cut
2466		2560
2467	sub cf::client::ext_event($$%) {	2561	sub cf::client::ext_msg($$@) {
2468	my ($self, $type, %msg) = @_;	2562	my ($self, $type, @msg) = @_;
2469		2563
2470	return unless $self->extcmd;	2564	my $extcmd = $self->extcmd;
2471		2565
		2566	if ($extcmd == 2) {
		2567	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2568	} elsif ($extcmd == 1) { # TODO: remove
2472	$msg{msgtype} = "event_$type";	2569	push @msg, msgtype => "event_$type";
2473	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2570	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2571	}
2474	}	2572	}
2475		2573
2476	=item $success = $client->query ($flags, "text", \&cb)	2574	=item $success = $client->query ($flags, "text", \&cb)
2477		2575
2478	Queues a query to the client, calling the given callback with	2576	Queues a query to the client, calling the given callback with
…		…
2533	my ($ns, $buf) = @_;	2631	my ($ns, $buf) = @_;
2534		2632
2535	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2633	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2536		2634
2537	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
2538	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2641	if (my $cb = $EXTICMD{$type}) {
2539	if (my %reply = $cb->($ns, $msg)) {	2642	my @reply = $cb->($ns, @payload);
2540	$reply{msgid} = $msg->{msgid};	2643
2541	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));	2644	$ns->ext_reply ($reply, @reply)
2542	}	2645	if $reply;
2543	}	2646	}
2544	} else {	2647	} else {
2545	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";
2546	}	2649	}
2547		2650
…		…
2762	# TODO: for gcfclient pleasure, we should give resources	2865	# TODO: for gcfclient pleasure, we should give resources
2763	# that gcfclient doesn't grok a >10000 face index.	2866	# that gcfclient doesn't grok a >10000 face index.
2764	my $res = $facedata->{resource};	2867	my $res = $facedata->{resource};
2765	my $enc = JSON::XS->new->utf8->canonical;	2868	my $enc = JSON::XS->new->utf8->canonical;
2766		2869
		2870	my $soundconf = delete $res->{"res/sound.conf"};
		2871
2767	while (my ($name, $info) = each %$res) {	2872	while (my ($name, $info) = each %$res) {
2768	my $meta = $enc->encode ({	2873	my $meta = $enc->encode ({
2769	name => $name,	2874	name => $name,
2770	type => $info->{type},	2875	%{ $info->{meta} \|\| {} },
2771	copyright => $info->{copyright}, #TODO#
2772	});	2876	});
2773	my $data = pack "(w/a)", $meta, $info->{data};
2774	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2775		2877
2776	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	2878	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
2777	cf::face::set_type $idx, 1;	2879
		2880	if ($info->{type} & 1) {
		2881	# prepend meta info
		2882
		2883	my $data = pack "(w/a)", $meta, $info->{data};
		2884	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
		2885
2778	cf::face::set_data $idx, 0, $data, $chk;	2886	cf::face::set_data $idx, 0, $data, $chk;
		2887	} else {
		2888	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
		2889	}
		2890
		2891	cf::face::set_type $idx, $info->{type};
2779		2892
2780	cf::cede_to_tick;	2893	cf::cede_to_tick;
2781	}	2894	}
		2895
		2896	if ($soundconf) {
		2897	$soundconf = $enc->decode (delete $soundconf->{data});
		2898
		2899	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		2900	my $sound = $soundconf->{compat}[$_]
		2901	or next;
		2902
		2903	my $face = cf::face::find "sound/$sound->[1]";
		2904	warn "$sound->[0]: $face\n";#d#
		2905
		2906	cf::sound::set $sound->[0] => $face;
		2907	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		2908	}
		2909
		2910	#TODO
		2911	}
2782	}	2912	}
2783		2913
2784	1	2914	1
2785	}	2915	}
		2916
		2917	register_exticmd fx_want => sub {
		2918	my ($ns, $want) = @_;
		2919
		2920	while (my ($k, $v) = each %$want) {
		2921	$ns->fx_want ($k, $v);
		2922	}
		2923	};
2786		2924
2787	sub reload_regions {	2925	sub reload_regions {
2788	load_resource_file "$MAPDIR/regions"	2926	load_resource_file "$MAPDIR/regions"
2789	or die "unable to load regions file\n";	2927	or die "unable to load regions file\n";
2790		2928

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.305 by root, Thu Jul 12 08:40:14 2007 UTC vs. Revision 1.321 by root, Thu Jul 26 21:44:43 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.305 by root, Thu Jul 12 08:40:14 2007 UTC vs.
Revision 1.321 by root, Thu Jul 26 21:44:43 2007 UTC