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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.38 by root, Thu Aug 24 17:29:30 2006 UTC vs.
Revision 1.53 by root, Tue Aug 29 13:11:58 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	@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	73	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
77	@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
78		74
79	# we bless all objects into 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 cf::living)) {
82	no strict 'refs';	78	no strict 'refs';
83	@{"ext::$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 {
87	warn "error in event callback: @_";	83	warn "error in event callback: @_";
88	};	84	};
…		…
91	my @exts;	87	my @exts;
92	my @hook;	88	my @hook;
93	my %command;	89	my %command;
94	my %extcmd;	90	my %extcmd;
95		91
		92	#############################################################################
		93	# utility functions
		94
		95	use JSON::Syck (); # TODO# replace by JSON::PC once working
		96
		97	sub from_json($) {
		98	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
		99	JSON::Syck::Load $_[0]
		100	}
		101
		102	sub to_json($) {
		103	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
		104	JSON::Syck::Dump $_[0]
		105	}
		106
		107	#############################################################################
		108	# "new" plug-in system
		109
		110	=item $object->attach ($attachment, key => $value...)
		111
		112	=item $object->detach ($attachment)
		113
		114	Attach/detach a pre-registered attachment to an object.
		115
		116	=item $player->attach ($attachment, key => $value...)
		117
		118	=item $player->detach ($attachment)
		119
		120	Attach/detach a pre-registered attachment to a player.
		121
		122	=item $map->attach ($attachment, key => $value...)
		123
		124	=item $map->detach ($attachment)
		125
		126	Attach/detach a pre-registered attachment to a map.
		127
		128	=item cf::attach_global ...
		129
		130	Attach handlers for global events.
		131
		132	This and all following C<attach_*>-functions expect any number of the
		133	following handler/hook descriptions:
		134
		135	=over 4
		136
		137	=item prio => $number
		138
		139	Set the priority for all following handlers/hooks (unless overwritten
		140	by another C<prio> setting). Lower priority handlers get executed
		141	earlier. The default priority is C<0>, and many built-in handlers are
		142	registered at priority C<-1000>, so lower priorities should not be used
		143	unless you know what you are doing.
		144
		145	=item on_I<event> => \&cb
		146
		147	Call the given code reference whenever the named event happens (event is
		148	something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
		149	handlers are recognised generally depends on the type of object these
		150	handlers attach to).
		151
		152	See F<include/eventinc.h> for the full list of events supported, and their
		153	class.
		154
		155	=item package => package::
		156
		157	Look for sub functions of the name C<< on_I<event> >> in the given
		158	package and register them. Only handlers for eevents supported by the
		159	object/class are recognised.
		160
		161	=back
		162
		163	=item cf::attach_to_type $object_type, $subtype, ...
		164
		165	Attach handlers for a specific object type (e.g. TRANSPORT) and
		166	subtype. If C<$subtype> is zero or undef, matches all objects of the given
		167	type.
		168
		169	=item cf::attach_to_objects ...
		170
		171	Attach handlers to all objects. Do not use this except for debugging or
		172	very rare events, as handlers are (obviously) called for I<all> objects in
		173	the game.
		174
		175	=item cf::attach_to_players ...
		176
		177	Attach handlers to all players.
		178
		179	=item cf::attach_to_maps ...
		180
		181	Attach handlers to all maps.
		182
		183	=item cf:register_attachment $name, ...
		184
		185	Register an attachment by name through which objects can refer to this
		186	attachment.
		187
		188	=item cf:register_map_attachment $name, ...
		189
		190	Register an attachment by name through which maps can refer to this
		191	attachment.
		192
		193	=cut
		194
		195	# the following variables are defined in .xs and must not be re-created
		196	our @CB_GLOBAL = (); # registry for all global events
		197	our @CB_OBJECT = (); # all objects (should not be used except in emergency)
		198	our @CB_PLAYER = ();
		199	our @CB_TYPE = (); # registry for type (cf-object class) based events
		200	our @CB_MAP = ();
		201
		202	my %attachment;
		203
		204	sub _attach_cb($\%$$$) {
		205	my ($registry, $undo, $event, $prio, $cb) = @_;
		206
		207	use sort 'stable';
		208
		209	$cb = [$prio, $cb];
		210
		211	@{$registry->[$event]} = sort
		212	{ $a->[0] cmp $b->[0] }
		213	@{$registry->[$event] \|\| []}, $cb;
		214
		215	push @{$undo->{cb}}, [$event, $cb];
		216	}
		217
		218	# attach handles attaching event callbacks
		219	# the only thing the caller has to do is pass the correct
		220	# registry (== where the callback attaches to).
		221	sub _attach(\@$@) {
		222	my ($registry, $klass, @arg) = @_;
		223
		224	my $prio = 0;
		225
		226	my %undo = (
		227	registry => $registry,
		228	cb => [],
		229	);
		230
		231	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
		232
		233	while (@arg) {
		234	my $type = shift @arg;
		235
		236	if ($type eq "prio") {
		237	$prio = shift @arg;
		238
		239	} elsif ($type eq "package") {
		240	my $pkg = shift @arg;
		241
		242	while (my ($name, $id) = each %cb_id) {
		243	if (my $cb = $pkg->can ($name)) {
		244	_attach_cb $registry, %undo, $id, $prio, $cb;
		245	}
		246	}
		247
		248	} elsif (exists $cb_id{$type}) {
		249	_attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
		250
		251	} elsif (ref $type) {
		252	warn "attaching objects not supported, ignoring.\n";
		253
		254	} else {
		255	shift @arg;
		256	warn "attach argument '$type' not supported, ignoring.\n";
		257	}
		258	}
		259
		260	\%undo
		261	}
		262
		263	sub _attach_attachment {
		264	my ($obj, $name, %arg) = @_;
		265
		266	my $res;
		267
		268	if (my $attach = $attachment{$name}) {
		269	my $registry = $obj->registry;
		270
		271	for (@$attach) {
		272	my ($klass, @attach) = @$_;
		273	$res = _attach @$registry, $klass, @attach;
		274	}
		275
		276	$obj->{$name} = \%arg;
		277	} else {
		278	warn "object uses attachment '$name' that is not available, postponing.\n";
		279	}
		280
		281	$obj->{_attachment}{$name} = undef;
		282
		283	$res->{attachment} = $name;
		284	$res
		285	}
		286
		287	sub cf::object::attach {
		288	my ($obj, $name, %arg) = @_;
		289
		290	_attach_attachment $obj, $name, %arg;
		291	}
		292
		293	sub cf::player::attach {
		294	my ($obj, $name, %arg) = @_;
		295
		296	_attach_attachment $obj, $name, %arg;
		297	}
		298
		299	sub cf::map::attach {
		300	my ($obj, $name, %arg) = @_;
		301
		302	_attach_attachment $obj, $name, %arg;
		303	}
		304
		305	sub cf::object::detach {
		306	my ($obj, $name) = @_;
		307	die;#d#
		308	}
		309	sub cf::player::detach {
		310	my ($obj, $name) = @_;
		311	die;#d#
		312	}
		313	sub cf::map::detach {
		314	my ($obj, $name) = @_;
		315	die;#d#
		316	}
		317
		318	sub attach_global {
		319	_attach @CB_GLOBAL, KLASS_GLOBAL, @_
		320	}
		321
		322	sub attach_to_type {
		323	my $type = shift;
		324	my $subtype = shift;
		325
		326	_attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
		327	}
		328
		329	sub attach_to_objects {
		330	_attach @CB_OBJECT, KLASS_OBJECT, @_
		331	}
		332
		333	sub attach_to_players {
		334	_attach @CB_PLAYER, KLASS_PLAYER, @_
		335	}
		336
		337	sub attach_to_maps {
		338	_attach @CB_MAP, KLASS_MAP, @_
		339	}
		340
		341	sub register_attachment {
		342	my $name = shift;
		343
		344	$attachment{$name} = [[KLASS_OBJECT, @_]];
		345	}
		346
		347	sub register_map_attachment {
		348	my $name = shift;
		349
		350	$attachment{$name} = [[KLASS_MAP, @_]];
		351	}
		352
		353	our $override;
		354	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
		355
		356	sub override {
		357	$override = 1;
		358	@invoke_results = ();
		359	}
		360
		361	sub do_invoke {
		362	my $event = shift;
		363	my $callbacks = shift;
		364
		365	@invoke_results = ();
		366
		367	local $override;
		368
		369	for (@$callbacks) {
		370	eval { &{$_->[1]} };
		371
		372	if ($@) {
		373	warn "$@";
		374	warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
		375	override;
		376	}
		377
		378	return 1 if $override;
		379	}
		380
		381	0
		382	}
		383
		384	#############################################################################
		385	# object support
		386
		387	sub instantiate {
		388	my ($obj, $data) = @_;
		389
		390	$data = from_json $data;
		391
		392	for (@$data) {
		393	my ($name, $args) = @$_;
		394
		395	$obj->attach ($name, %{$args \|\| {} });
		396	}
		397	}
		398
		399	# basically do the same as instantiate, without calling instantiate
		400	sub reattach {
		401	my ($obj) = @_;
		402	my $registry = $obj->registry;
		403
		404	@$registry = ();
		405
		406	delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} \|\| {} };
		407
		408	for my $name (keys %{ $obj->{_attachment} \|\| {} }) {
		409	if (my $attach = $attachment{$name}) {
		410	for (@$attach) {
		411	my ($klass, @attach) = @$_;
		412	_attach @$registry, $klass, @attach;
		413	}
		414	} else {
		415	warn "object uses attachment '$name' that is not available, postponing.\n";
		416	}
		417	}
		418	}
		419
		420	sub object_freezer_save {
		421	my ($filename, $objs) = @_;
		422
		423	if (@$objs) {
		424	open my $fh, ">:raw", "$filename.pst~";
		425	syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
		426	close $fh;
		427	chmod SAVE_MODE, "$filename.pst~";
		428	rename "$filename.pst~", "$filename.pst";
		429	} else {
		430	unlink "$filename.pst";
		431	}
		432
		433	chmod SAVE_MODE, "$filename~";
		434	rename "$filename~", $filename;
		435	}
		436
		437	sub object_thawer_load {
		438	my ($filename) = @_;
		439
		440	open my $fh, "<:raw:perlio", "$filename.pst"
		441	or return;
		442
		443	eval { local $/; (Storable::thaw <$fh>)->{objs} }
		444	}
		445
		446	attach_to_objects
		447	prio => -1000000,
		448	on_clone => sub {
		449	my ($src, $dst) = @_;
		450
		451	@{$dst->registry} = @{$src->registry};
		452
		453	%$dst = %$src;
		454
		455	%{$dst->{_attachment}} = %{$src->{_attachment}}
		456	if exists $src->{_attachment};
		457	},
		458	;
		459
		460	#############################################################################
		461	# old plug-in events
		462
96	sub inject_event {	463	sub inject_event {
97	my $extension = shift;	464	my $extension = shift;
98	my $event_code = shift;	465	my $event_code = shift;
99		466
100	my $cb = $hook[$event_code]{$extension}	467	my $cb = $hook[$event_code]{$extension}
…		…
142	}	509	}
143		510
144	sub register {	511	sub register {
145	my ($base, $pkg) = @_;	512	my ($base, $pkg) = @_;
146		513
147	for my $idx (0 .. $#PLUGIN_EVENT) {	514	#TODO
148	if (my $ref = $pkg->can ("on_$PLUGIN_EVENT[$idx]")) {
149	#warn "registering $PLUGIN_EVENT[$idx] hook to '$pkg'\n";
150	$hook[$idx]{$base} = $ref;
151	}
152	}
153	}	515	}
154		516
155	sub load_extension {	517	sub load_extension {
156	my ($path) = @_;	518	my ($path) = @_;
157		519
158	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	520	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
159	my $base = $1;	521	my $base = $1;
160	my $pkg = $1;	522	my $pkg = $1;
161	$pkg =~ s/[^[:word:]]/_/g;	523	$pkg =~ s/[^[:word:]]/_/g;
162	$pkg = "cf::ext::$pkg";	524	$pkg = "ext::$pkg";
163		525
164	warn "loading '$path' into '$pkg'\n";	526	warn "loading '$path' into '$pkg'\n";
165		527
166	open my $fh, "<:utf8", $path	528	open my $fh, "<:utf8", $path
167	or die "$path: $!";	529	or die "$path: $!";
…		…
188	my ($pkg) = @_;	550	my ($pkg) = @_;
189		551
190	warn "removing extension $pkg\n";	552	warn "removing extension $pkg\n";
191		553
192	# remove hooks	554	# remove hooks
		555	#TODO
193	for my $idx (0 .. $#PLUGIN_EVENT) {	556	# for my $idx (0 .. $#PLUGIN_EVENT) {
194	delete $hook[$idx]{$pkg};	557	# delete $hook[$idx]{$pkg};
195	}	558	# }
196		559
197	# remove commands	560	# remove commands
198	for my $name (keys %command) {	561	for my $name (keys %command) {
199	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };	562	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
200		563
…		…
210	# remove extcmds	573	# remove extcmds
211	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {	574	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
212	delete $extcmd{$name};	575	delete $extcmd{$name};
213	}	576	}
214		577
215	if (my $cb = $pkg->can ("on_unload")) {	578	if (my $cb = $pkg->can ("unload")) {
216	eval {	579	eval {
217	$cb->($pkg);	580	$cb->($pkg);
218	1	581	1
219	} or warn "$pkg unloaded, but with errors: $@";	582	} or warn "$pkg unloaded, but with errors: $@";
220	}	583	}
…		…
264	}	627	}
265		628
266	Symbol::delete_package $k;	629	Symbol::delete_package $k;
267	}	630	}
268		631
269	# 4. get rid of ext::, as good as possible	632	# 4. get rid of safe::, as good as possible
270	Symbol::delete_package "ext::$_"	633	Symbol::delete_package "safe::$_"
271	for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);	634	for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
272		635
273	# 5. remove register_script_function callbacks	636	# 5. remove register_script_function callbacks
274	# TODO	637	# TODO
275		638
276	# 6. unload cf.pm "a bit"	639	# 6. unload cf.pm "a bit"
277	delete $INC{"cf.pm"};	640	delete $INC{"cf.pm"};
278		641
279	# don't, removes xs symbols, too	642	# don't, removes xs symbols, too,
		643	# and global variables created in xs
280	#Symbol::delete_package __PACKAGE__;	644	#Symbol::delete_package __PACKAGE__;
281		645
282	# 7. reload cf.pm	646	# 7. reload cf.pm
283	$msg->("reloading cf.pm");	647	$msg->("reloading cf.pm");
284	require cf;	648	require cf;
…		…
305	};	669	};
306	}	670	}
307	};	671	};
308		672
309	#############################################################################	673	#############################################################################
310	# utility functions
311
312	use JSON::Syck (); # TODO# replace by JSON::PC once working
313
314	sub from_json($) {
315	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
316	JSON::Syck::Load $_[0]
317	}
318
319	sub to_json($) {
320	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
321	JSON::Syck::Dump $_[0]
322	}
323
324	#############################################################################
325	# extcmd framework, basically convert ext <msg>	674	# extcmd framework, basically convert ext <msg>
326	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few	675	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
327		676
328	sub on_extcmd {	677	attach_to_players
		678	on_extcmd => sub {
329	my ($pl, $buf) = @_;	679	my ($pl, $buf) = @_;
330		680
331	my $msg = eval { from_json $buf };	681	my $msg = eval { from_json $buf };
332		682
333	if (ref $msg) {	683	if (ref $msg) {
334	if (my $cb = $extcmd{$msg->{msgtype}}) {	684	if (my $cb = $extcmd{$msg->{msgtype}}) {
335	if (my %reply = $cb->[0]->($pl, $msg)) {	685	if (my %reply = $cb->[0]->($pl, $msg)) {
336	$pl->ext_reply ($msg->{msgid}, %reply);	686	$pl->ext_reply ($msg->{msgid}, %reply);
		687	}
		688	}
		689	} else {
		690	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
		691	}
		692
		693	cf::override;
		694	},
		695	;
		696
		697	#############################################################################
		698	# load/save/clean perl data associated with a map
		699
		700	*cf::mapsupport::on_clean = sub {
		701	my ($map) = @_;
		702
		703	my $path = $map->tmpname;
		704	defined $path or return;
		705
		706	unlink "$path.pst";
		707	};
		708
		709	# old style persistent data, TODO: remove #d#
		710	*cf::mapsupport::on_swapin =
		711	*cf::mapsupport::on_load = sub {
		712	my ($map) = @_;
		713
		714	my $path = $map->tmpname;
		715	$path = $map->path unless defined $path;
		716
		717	open my $fh, "<:raw", "$path.cfperl"
		718	or return; # no perl data
		719
		720	my $data = Storable::thaw do { local $/; <$fh> };
		721
		722	$data->{version} <= 1
		723	or return; # too new
		724
		725	$map->_set_obs ($data->{obs});
		726	$map->invoke (EVENT_MAP_UPGRADE);
		727	};
		728
		729	attach_to_maps prio => -10000, package => cf::mapsupport::;
		730
		731	#############################################################################
		732	# load/save perl data associated with player->ob objects
		733
		734	sub all_objects(@) {
		735	@_, map all_objects ($_->inv), @_
		736	}
		737
		738	attach_to_players
		739	on_load => sub {
		740	my ($pl, $path) = @_;
		741
		742	for my $o (all_objects $pl->ob) {
		743	if (my $value = $o->get_ob_key_value ("_perl_data")) {
		744	$o->set_ob_key_value ("_perl_data");
		745
		746	%$o = %{ Storable::thaw pack "H*", $value };
337	}	747	}
338	}	748	}
339	} else {
340	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
341	}	749	},
342		750	;
343	1
344	}
345
346	#############################################################################
347	# load/save/clean perl data associated with a map
348
349	*on_mapclean = sub {
350	my ($map) = @_;
351
352	my $path = $map->tmpname;
353	defined $path or return;
354
355	unlink "$path.cfperl";
356	};
357
358	*on_mapin =
359	*on_mapload = sub {
360	my ($map) = @_;
361
362	my $path = $map->tmpname;
363	$path = $map->path unless defined $path;
364
365	open my $fh, "<:raw", "$path.cfperl"
366	or return; # no perl data
367
368	my $data = Storable::thaw do { local $/; <$fh> };
369
370	$data->{version} <= 1
371	or return; # too new
372
373	$map->_set_obs ($data->{obs});
374	};
375
376	*on_mapout = sub {
377	my ($map) = @_;
378
379	my $path = $map->tmpname;
380	$path = $map->path unless defined $path;
381
382	my $obs = $map->_get_obs;
383
384	if (defined $obs) {
385	open my $fh, ">:raw", "$path.cfperl"
386	or die "$path.cfperl: $!";
387
388	stat $path;
389
390	print $fh Storable::nfreeze {
391	size => (stat _)[7],
392	time => (stat _)[9],
393	version => 1,
394	obs => $obs,
395	};
396
397	chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible g
398	} else {
399	unlink "$path.cfperl";
400	}
401	};
402
403	#############################################################################
404	# load/save perl data associated with player->ob objects
405
406	sub all_objects(@) {
407	@_, map all_objects ($_->inv), @_
408	}
409
410	*on_player_load = sub {
411	my ($ob, $path) = @_;
412
413	for my $o (all_objects $ob) {
414	if (my $value = $o->get_ob_key_value ("_perl_data")) {
415	$o->set_ob_key_value ("_perl_data");
416
417	%$o = %{ Storable::thaw pack "H*", $value };
418	}
419	}
420	};
421
422	*on_player_save = sub {
423	my ($ob, $path) = @_;
424
425	$_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
426	for grep %$_, all_objects $ob;
427	};
428		751
429	#############################################################################	752	#############################################################################
430	# core extensions - in perl	753	# core extensions - in perl
431		754
432	=item cf::player::exists $login	755	=item cf::player::exists $login
…		…
478	}	801	}
479		802
480	#############################################################################	803	#############################################################################
481	# map scripting support	804	# map scripting support
482		805
483	our $safe = new Safe "ext";	806	our $safe = new Safe "safe";
484	our $safe_hole = new Safe::Hole;	807	our $safe_hole = new Safe::Hole;
485		808
486	$SIG{FPE} = 'IGNORE';	809	$SIG{FPE} = 'IGNORE';
487		810
488	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	811	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
…		…
494	["cf::object::player" => qw(player)],	817	["cf::object::player" => qw(player)],
495	["cf::player" => qw(peaceful)],	818	["cf::player" => qw(peaceful)],
496	) {	819	) {
497	no strict 'refs';	820	no strict 'refs';
498	my ($pkg, @funs) = @$_;	821	my ($pkg, @funs) = @$_;
499	*{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	822	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
500	for @funs;	823	for @funs;
501	}	824	}
502		825
503	sub safe_eval($;@) {	826	sub safe_eval($;@) {
504	my ($code, %vars) = @_;	827	my ($code, %vars) = @_;
…		…
506	my $qcode = $code;	829	my $qcode = $code;
507	$qcode =~ s/"/‟/g; # not allowed in #line filenames	830	$qcode =~ s/"/‟/g; # not allowed in #line filenames
508	$qcode =~ s/\n/\\n/g;	831	$qcode =~ s/\n/\\n/g;
509		832
510	local $_;	833	local $_;
511	local @ext::cf::_safe_eval_args = values %vars;	834	local @safe::cf::_safe_eval_args = values %vars;
512		835
513	$code =	836	my $eval =
514	"do {\n"	837	"do {\n"
515	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	838	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
516	. "#line 0 \"{$qcode}\"\n"	839	. "#line 0 \"{$qcode}\"\n"
517	. $code	840	. $code
518	. "\n}"	841	. "\n}"
519	;	842	;
520		843
521	sub_generation_inc;	844	sub_generation_inc;
522	my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code);	845	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
523	sub_generation_inc;	846	sub_generation_inc;
		847
		848	if ($@) {
		849	warn "$@";
		850	warn "while executing safe code '$code'\n";
		851	warn "with arguments " . (join " ", %vars) . "\n";
		852	}
524		853
525	wantarray ? @res : $res[0]	854	wantarray ? @res : $res[0]
526	}	855	}
527		856
528	sub register_script_function {	857	sub register_script_function {
529	my ($fun, $cb) = @_;	858	my ($fun, $cb) = @_;
530		859
531	no strict 'refs';	860	no strict 'refs';
532	*{"ext::$fun"} = $safe_hole->wrap ($cb);	861	*{"safe::$fun"} = $safe_hole->wrap ($cb);
533	}	862	}
534		863
535	#############################################################################	864	#############################################################################
536	# the server's main()	865	# the server's main()
537		866
538	sub run {	867	sub main {
539	Event::loop;	868	Event::loop;
540	}	869	}
541		870
542	#############################################################################	871	#############################################################################
543	# initialisation	872	# initialisation
…		…
563	$TICK_WATCHER->at ($NEXT_TICK);	892	$TICK_WATCHER->at ($NEXT_TICK);
564	$TICK_WATCHER->start;	893	$TICK_WATCHER->start;
565	},	894	},
566	);	895	);
567		896
		897	_reload_2;
		898
568	1	899	1
569		900

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.38 by root, Thu Aug 24 17:29:30 2006 UTC vs. Revision 1.53 by root, Tue Aug 29 13:11:58 2006 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.38 by root, Thu Aug 24 17:29:30 2006 UTC vs.
Revision 1.53 by root, Tue Aug 29 13:11:58 2006 UTC