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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.44 by root, Sat Aug 26 08:44:06 2006 UTC vs.
Revision 1.47 by root, Sun Aug 27 13:02:04 2006 UTC

…		…
11	use Event;	11	use Event;
12	$Event::Eval = 1; # no idea why this is required, but it is	12	$Event::Eval = 1; # no idea why this is required, but it is
13		13
14	use strict;	14	use strict;
15		15
		16	_reload_1;
		17
16	our %COMMAND = ();	18	our %COMMAND = ();
17	our @EVENT;	19	our @EVENT;
18	our @PLUGIN_EVENT;
19	our %PROP_TYPE;	20	our %PROP_TYPE;
20	our %PROP_IDX;	21	our %PROP_IDX;
21	our $LIBDIR = maps_directory "perl";	22	our $LIBDIR = maps_directory "perl";
22		23
23	our $TICK = MAX_TIME * 1e-6;	24	our $TICK = MAX_TIME * 1e-6;
24	our $TICK_WATCHER;	25	our $TICK_WATCHER;
25	our $NEXT_TICK;	26	our $NEXT_TICK;
26		27
27	BEGIN {	28	BEGIN {
28	@PLUGIN_EVENT = map lc, @PLUGIN_EVENT;
29
30	*CORE::GLOBAL::warn = sub {	29	*CORE::GLOBAL::warn = sub {
31	my $msg = join "", @_;	30	my $msg = join "", @_;
32	$msg .= "\n"	31	$msg .= "\n"
33	unless $msg =~ /\n$/;	32	unless $msg =~ /\n$/;
34		33
…		…
69	prop_gen PLAYER_PROP => "cf::object::player";	68	prop_gen PLAYER_PROP => "cf::object::player";
70		69
71	prop_gen MAP_PROP => "cf::map";	70	prop_gen MAP_PROP => "cf::map";
72	prop_gen ARCH_PROP => "cf::arch";	71	prop_gen ARCH_PROP => "cf::arch";
73		72
74	# guessed hierarchies
75
76	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	73	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
77	@safe::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
78		74
79	# we bless all objects into (empty) derived classes to force a method lookup	75	# we bless all objects into (empty) derived classes to force a method lookup
80	# within the Safe compartment.	76	# within the Safe compartment.
81	for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {	77	for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
82	no strict 'refs';	78	no strict 'refs';
83	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	79	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
84	}	80	}
85		81
86	$Event::DIED = sub {	82	$Event::DIED = sub {
…		…
92	my @hook;	88	my @hook;
93	my %command;	89	my %command;
94	my %extcmd;	90	my %extcmd;
95		91
96	#############################################################################	92	#############################################################################
97	# object support	93	# utility functions
98		94
99	sub reattach {	95	use JSON::Syck (); # TODO# replace by JSON::PC once working
100	warn "reattach<@_>\n";
101	}
102		96
103	sub instantiate {	97	sub from_json($) {
104	warn "instantiate<@_>\n";	98	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
		99	JSON::Syck::Load $_[0]
105	}	100	}
106		101
107	sub clone {	102	sub to_json($) {
108	warn "clone<@_>\n";	103	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
		104	JSON::Syck::Dump $_[0]
109	}	105	}
110		106
111	#############################################################################	107	#############################################################################
112	# "new" plug-in system	108	# "new" plug-in system
113		109
114	=item cf::object::attach ... # NYI	110	=item $object->attach ($attachment, ...)
		111
		112	Attach a pre-registered attachment to an object.
		113
		114	=item $player->attach ($attachment, ...)
		115
		116	Attach a pre-registered attachment to a player.
		117
		118	=item $map->attach ($attachment, ...) # not yet persistent
		119
		120	Attach a pre-registered attachment to a map.
115		121
116	=item cf::attach_global ...	122	=item cf::attach_global ...
117		123
118	=item cf::attach_to_type ...	124	Attach handlers for global events.
		125
		126	This and all following C<attach_*>-functions expect any number of the
		127	following handler/hook descriptions:
		128
		129	=over 4
		130
		131	=item prio => $number
		132
		133	Set the priority for all following handlers/hooks (unless overwritten
		134	by another C<prio> setting). Lower priority handlers get executed
		135	earlier. The default priority is C<0>, and many built-in handlers are
		136	registered at priority C<-1000>, so lower priorities should not be used
		137	unless you know what you are doing.
		138
		139	=item on_I<event> => \&cb
		140
		141	Call the given code reference whenever the named event happens (event is
		142	something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
		143	handlers are recognised generally depends on the type of object these
		144	handlers attach to).
		145
		146	See F<include/eventinc.h> for the full list of events supported, and their
		147	class.
		148
		149	=item package => package::
		150
		151	Look for sub functions of the name C<< on_I<event> >> in the given
		152	package and register them. Only handlers for eevents supported by the
		153	object/class are recognised.
		154
		155	=back
		156
		157	=item cf::attach_to_type $object_type, $subtype, ...
		158
		159	Attach handlers for a specific object type (e.g. TRANSPORT) and
		160	subtype. If C<$subtype> is zero or undef, matches all objects of the given
		161	type.
119		162
120	=item cf::attach_to_objects ...	163	=item cf::attach_to_objects ...
121		164
		165	Attach handlers to all objects. Do not use this except for debugging or
		166	very rare events, as handlers are (obviously) called for I<all> objects in
		167	the game.
		168
122	=item cf::attach_to_players ...	169	=item cf::attach_to_players ...
123		170
		171	Attach handlers to all players.
		172
124	=item cf::attach_to_maps ...	173	=item cf::attach_to_maps ...
125		174
126	prio => $number, # lower is earlier	175	Attach handlers to all maps.
127	on_xxx => \&cb,	176
128	package => package::,	177	=item cf:register_attachment $name, ...
129		178
130	=cut	179	=cut
131		180
132	# the following variables are defined in .xs and must not be re-created	181	# the following variables are defined in .xs and must not be re-created
133	our @CB_GLOBAL = (); # registry for all global events	182	our @CB_GLOBAL = (); # registry for all global events
134	our @CB_OBJECT = ();	183	our @CB_OBJECT = (); # all objects (should not be used except in emergency)
135	our @CB_PLAYER = ();	184	our @CB_PLAYER = ();
136	our @CB_TYPE = (); # registry for type (cf-object class) based events	185	our @CB_TYPE = (); # registry for type (cf-object class) based events
137	our @CB_MAP = ();	186	our @CB_MAP = ();
138		187
		188	my %attachment;
		189
139	sub _attach_cb($\%$$$) {	190	sub _attach_cb($\%$$$) {
140	my ($registry, $undo, $event, $prio, $cb) = @_;	191	my ($registry, $undo, $event, $prio, $cb) = @_;
141		192
142	use sort 'stable';	193	use sort 'stable';
143		194
…		…
151	}	202	}
152		203
153	# attach handles attaching event callbacks	204	# attach handles attaching event callbacks
154	# the only thing the caller has to do is pass the correct	205	# the only thing the caller has to do is pass the correct
155	# registry (== where the callback attaches to).	206	# registry (== where the callback attaches to).
156	sub _attach(\@$\@) {	207	sub _attach(\@$@) {
157	my ($registry, $klass, $arg) = @_;	208	my ($registry, $klass, @arg) = @_;
158		209
159	my $prio = 0;	210	my $prio = 0;
160		211
161	my %undo = (	212	my %undo = (
162	registry => $registry,	213	registry => $registry,
163	cb => [],	214	cb => [],
164	);	215	);
165		216
166	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;	217	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
167		218
168	while (@$arg) {	219	while (@arg) {
169	my $type = shift @$arg;	220	my $type = shift @arg;
170		221
171	if ($type eq "prio") {	222	if ($type eq "prio") {
172	$prio = shift @$arg;	223	$prio = shift @arg;
173		224
174	} elsif ($type eq "package") {	225	} elsif ($type eq "package") {
175	my $pkg = shift @$arg;	226	my $pkg = shift @arg;
176		227
177	while (my ($name, $id) = each %cb_id) {	228	while (my ($name, $id) = each %cb_id) {
178	if (my $cb = $pkg->can ($name)) {	229	if (my $cb = $pkg->can ($name)) {
179	_attach_cb $registry, %undo, $id, $prio, $cb;	230	_attach_cb $registry, %undo, $id, $prio, $cb;
180	}	231	}
181	}	232	}
182		233
183	} elsif (exists $cb_id{$type}) {	234	} elsif (exists $cb_id{$type}) {
184	_attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @$arg;	235	_attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
185		236
186	} elsif (ref $type) {	237	} elsif (ref $type) {
187	warn "attaching objects not supported, ignoring.\n";	238	warn "attaching objects not supported, ignoring.\n";
188		239
189	} else {	240	} else {
190	shift @$arg;	241	shift @arg;
191	warn "attach argument '$type' not supported, ignoring.\n";	242	warn "attach argument '$type' not supported, ignoring.\n";
192	}	243	}
193	}	244	}
194		245
195	\%undo	246	\%undo
196	}	247	}
197		248
		249	sub _attach_attachment {
		250	my ($obj, $name, @args) = @_;
		251
		252	my $res;
		253
		254	if (my $attach = $attachment{$name}) {
		255	my $registry = $obj->registry;
		256
		257	for (@$attach) {
		258	my ($klass, @attach) = @$_;
		259	$res = _attach @$registry, $klass, @attach;
		260	}
		261
		262	if (my $cb = delete $registry->[EVENT_OBJECT_INSTANTIATE]) {
		263	for (@$cb) {
		264	eval { $_->[1]->($obj, @args); };
		265	if ($@) {
		266	warn "$@";
		267	warn "... while processing '$name' instantiate with args <@args>.\n";
		268	}
		269	}
		270	}
		271	} else {
		272	warn "object uses attachment '$name' that is not available, postponing.\n";
		273	}
		274
		275	push @{$obj->{_attachment}}, $name;
		276
		277	$res->{attachment} = $name;
		278	$res
		279	}
		280
198	sub cf::object::attach {	281	sub cf::object::attach {
199	die;	282	my ($obj, $name, @args) = @_;
		283
		284	_attach_attachment $obj, $name, @args;
		285	}
		286
		287	sub cf::player::attach {
		288	my ($obj, $name, @args) = @_;
		289
		290	_attach_attachment KLASS_PLAYER, $obj, $name, @args;
		291	}
		292
		293	sub cf::map::attach {
		294	my ($obj, $name, @args) = @_;
		295
		296	_attach_attachment KLASS_MAP, $obj, $name, @args;
200	}	297	}
201		298
202	sub attach_global {	299	sub attach_global {
203	_attach @CB_GLOBAL, KLASS_GLOBAL, @_	300	_attach @CB_GLOBAL, KLASS_GLOBAL, @_
204	}	301	}
205		302
206	sub attach_to_type {	303	sub attach_to_type {
207	my $type = shift;	304	my $type = shift;
		305	my $subtype = shift;
		306
208	_attach @{$CB_TYPE[$type]}, KLASS_OBJECT, @_	307	_attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
209	}	308	}
210		309
211	sub attach_to_objects {	310	sub attach_to_objects {
212	_attach @CB_OBJECT, KLASS_OBJECT, @_	311	_attach @CB_OBJECT, KLASS_OBJECT, @_
213	}	312	}
…		…
218		317
219	sub attach_to_maps {	318	sub attach_to_maps {
220	_attach @CB_MAP, KLASS_MAP, @_	319	_attach @CB_MAP, KLASS_MAP, @_
221	}	320	}
222		321
		322	sub register_attachment {
		323	my $name = shift;
		324
		325	$attachment{$name} = [[KLASS_OBJECT, @_]];
		326	}
		327
223	our $override;	328	our $override;
		329	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
224		330
225	sub override() {	331	sub override {
226	$override = 1	332	$override = 1;
		333	@invoke_results = ();
227	}	334	}
228		335
229	sub invoke {	336	sub do_invoke {
230	my $event = shift;	337	my $event = shift;
231	my $callbacks = shift;	338	my $callbacks = shift;
		339
		340	@invoke_results = ();
232		341
233	local $override;	342	local $override;
234		343
235	for (@$callbacks) {	344	for (@$callbacks) {
236	eval { &{$_->[1]} };	345	eval { &{$_->[1]} };
…		…
246		355
247	0	356	0
248	}	357	}
249		358
250	#############################################################################	359	#############################################################################
		360	# object support
		361
		362	sub instantiate {
		363	my ($obj, $data) = @_;
		364
		365	$data = from_json $data;
		366
		367	for (@$data) {
		368	my ($name, $args) = @$_;
		369	attach $obj, $name, @{$args \|\| [] };
		370	}
		371	}
		372
		373	# basically do the same as instantiate, without calling instantiate
		374	sub reattach {
		375	my ($obj) = @_;
		376	my $registry = $obj->registry;
		377
		378	@$registry = ();
		379
		380	for my $name (@{ $obj->{_attachment} }) {
		381	if (my $attach = $attachment{$name}) {
		382	for (@$attach) {
		383	my ($klass, @attach) = @$_;
		384	_attach @$registry, $klass, @attach;
		385	}
		386	} else {
		387	warn "object uses attachment '$name' that is not available, postponing.\n";
		388	}
		389	}
		390	}
		391
		392	sub object_freezer_save {
		393	my ($filename, $objs) = @_;
		394
		395	$filename .= ".pst";
		396
		397	if (@$objs) {
		398	open my $fh, ">:raw", "$filename~";
		399	chmod $fh, SAVE_MODE;
		400	syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
		401	close $fh;
		402	rename "$filename~", $filename;
		403	} else {
		404	unlink $filename;
		405	}
		406	}
		407
		408	sub object_thawer_load {
		409	my ($filename) = @_;
		410
		411	open my $fh, "<:raw:perlio", "$filename.pst"
		412	or return;
		413
		414	eval { local $/; (Storable::thaw <$fh>)->{objs} }
		415	}
		416
		417	attach_to_objects
		418	prio => -1000000,
		419	on_clone => sub {
		420	my ($src, $dst) = @_;
		421
		422	@{$dst->registry} = @{$src->registry};
		423
		424	%$dst = %$src;
		425
		426	$dst->{_attachment} = [@{ $src->{_attachment} }]
		427	if exists $src->{_attachment};
		428	},
		429	;
		430
		431	#############################################################################
251	# old plug-in events	432	# old plug-in events
252		433
253	sub inject_event {	434	sub inject_event {
254	my $extension = shift;	435	my $extension = shift;
255	my $event_code = shift;	436	my $event_code = shift;
…		…
299	}	480	}
300		481
301	sub register {	482	sub register {
302	my ($base, $pkg) = @_;	483	my ($base, $pkg) = @_;
303		484
304	for my $idx (0 .. $#PLUGIN_EVENT) {	485	#TODO
305	if (my $ref = $pkg->can ("on_$PLUGIN_EVENT[$idx]")) {
306	#warn "registering $PLUGIN_EVENT[$idx] hook to '$pkg'\n";
307	$hook[$idx]{$base} = $ref;
308	}
309	}
310	}	486	}
311		487
312	sub load_extension {	488	sub load_extension {
313	my ($path) = @_;	489	my ($path) = @_;
314		490
…		…
345	my ($pkg) = @_;	521	my ($pkg) = @_;
346		522
347	warn "removing extension $pkg\n";	523	warn "removing extension $pkg\n";
348		524
349	# remove hooks	525	# remove hooks
		526	#TODO
350	for my $idx (0 .. $#PLUGIN_EVENT) {	527	# for my $idx (0 .. $#PLUGIN_EVENT) {
351	delete $hook[$idx]{$pkg};	528	# delete $hook[$idx]{$pkg};
352	}	529	# }
353		530
354	# remove commands	531	# remove commands
355	for my $name (keys %command) {	532	for my $name (keys %command) {
356	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };	533	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
357		534
…		…
423	Symbol::delete_package $k;	600	Symbol::delete_package $k;
424	}	601	}
425		602
426	# 4. get rid of safe::, as good as possible	603	# 4. get rid of safe::, as good as possible
427	Symbol::delete_package "safe::$_"	604	Symbol::delete_package "safe::$_"
428	for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);	605	for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
429		606
430	# 5. remove register_script_function callbacks	607	# 5. remove register_script_function callbacks
431	# TODO	608	# TODO
432		609
433	# 6. unload cf.pm "a bit"	610	# 6. unload cf.pm "a bit"
…		…
461	warn $_[0];	638	warn $_[0];
462	$who->message ($_[0]);	639	$who->message ($_[0]);
463	};	640	};
464	}	641	}
465	};	642	};
466
467	#############################################################################
468	# utility functions
469
470	use JSON::Syck (); # TODO# replace by JSON::PC once working
471
472	sub from_json($) {
473	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
474	JSON::Syck::Load $_[0]
475	}
476
477	sub to_json($) {
478	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
479	JSON::Syck::Dump $_[0]
480	}
481		643
482	#############################################################################	644	#############################################################################
483	# extcmd framework, basically convert ext <msg>	645	# extcmd framework, basically convert ext <msg>
484	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few	646	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
485		647
…		…
511		673
512	my $path = $map->tmpname;	674	my $path = $map->tmpname;
513	defined $path or return;	675	defined $path or return;
514		676
515	unlink "$path.cfperl";	677	unlink "$path.cfperl";
		678	unlink "$path.pst";
516	};	679	};
517		680
518	*cf::mapsupport::on_swapin =	681	*cf::mapsupport::on_swapin =
519	*cf::mapsupport::on_load = sub {	682	*cf::mapsupport::on_load = sub {
520	my ($map) = @_;	683	my ($map) = @_;
…		…
531	or return; # too new	694	or return; # too new
532		695
533	$map->_set_obs ($data->{obs});	696	$map->_set_obs ($data->{obs});
534	};	697	};
535		698
536	*cf::mapsupport::on_swapout = sub {
537	my ($map) = @_;
538
539	my $path = $map->tmpname;
540	$path = $map->path unless defined $path;
541
542	my $obs = $map->_get_obs;
543
544	if (defined $obs) {
545	open my $fh, ">:raw", "$path.cfperl"
546	or die "$path.cfperl: $!";
547
548	stat $path;
549
550	print $fh Storable::nfreeze {
551	size => (stat _)[7],
552	time => (stat _)[9],
553	version => 1,
554	obs => $obs,
555	};
556
557	chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible g
558	} else {
559	unlink "$path.cfperl";
560	}
561	};
562
563	attach_to_maps prio => -10000, package => cf::mapsupport::;	699	attach_to_maps prio => -10000, package => cf::mapsupport::;
564		700
565	#############################################################################	701	#############################################################################
566	# load/save perl data associated with player->ob objects	702	# load/save perl data associated with player->ob objects
567		703
…		…
578	$o->set_ob_key_value ("_perl_data");	714	$o->set_ob_key_value ("_perl_data");
579		715
580	%$o = %{ Storable::thaw pack "H*", $value };	716	%$o = %{ Storable::thaw pack "H*", $value };
581	}	717	}
582	}	718	}
583	},
584	on_save => sub {
585	my ($pl, $path) = @_;
586
587	$_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
588	for grep %$_, all_objects $pl->ob;
589	},	719	},
590	;	720	;
591		721
592	#############################################################################	722	#############################################################################
593	# core extensions - in perl	723	# core extensions - in perl
…		…
732	$TICK_WATCHER->at ($NEXT_TICK);	862	$TICK_WATCHER->at ($NEXT_TICK);
733	$TICK_WATCHER->start;	863	$TICK_WATCHER->start;
734	},	864	},
735	);	865	);
736		866
		867	_reload_2;
		868
737	1	869	1
738		870

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.44 by root, Sat Aug 26 08:44:06 2006 UTC vs. Revision 1.47 by root, Sun Aug 27 13:02:04 2006 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.44 by root, Sat Aug 26 08:44:06 2006 UTC vs.
Revision 1.47 by root, Sun Aug 27 13:02:04 2006 UTC