[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.46 by root, Sun Aug 27 16:15:12 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	our %COMMAND;	16	our %COMMAND = ();
17	our @EVENT;	17	our @EVENT;
18	our @PLUGIN_EVENT;
19	our %PROP_TYPE;	18	our %PROP_TYPE;
20	our %PROP_IDX;	19	our %PROP_IDX;
21	our $LIBDIR = maps_directory "perl";	20	our $LIBDIR = maps_directory "perl";
22		21
23	our $TICK = MAX_TIME * 1e-6;	22	our $TICK = MAX_TIME * 1e-6;
24	our $TICK_WATCHER;	23	our $TICK_WATCHER;
25	our $NEXT_TICK;	24	our $NEXT_TICK;
26		25
27	BEGIN {	26	BEGIN {
28	@PLUGIN_EVENT = map lc, @PLUGIN_EVENT;
29
30	*CORE::GLOBAL::warn = sub {	27	*CORE::GLOBAL::warn = sub {
31	my $msg = join "", @_;	28	my $msg = join "", @_;
32	$msg .= "\n"	29	$msg .= "\n"
33	unless $msg =~ /\n$/;	30	unless $msg =~ /\n$/;
34		31
…		…
69	prop_gen PLAYER_PROP => "cf::object::player";	66	prop_gen PLAYER_PROP => "cf::object::player";
70		67
71	prop_gen MAP_PROP => "cf::map";	68	prop_gen MAP_PROP => "cf::map";
72	prop_gen ARCH_PROP => "cf::arch";	69	prop_gen ARCH_PROP => "cf::arch";
73		70
74	# guessed hierarchies
75
76	@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	71	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
77	@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
78		72
79	# we bless all objects into derived classes to force a method lookup	73	# we bless all objects into (empty) derived classes to force a method lookup
80	# within the Safe compartment.	74	# 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)) {	75	for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
82	no strict 'refs';	76	no strict 'refs';
83	@{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	77	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
84	}	78	}
85		79
86	$Event::DIED = sub {	80	$Event::DIED = sub {
87	warn "error in event callback: @_";	81	warn "error in event callback: @_";
88	};	82	};
…		…
91	my @exts;	85	my @exts;
92	my @hook;	86	my @hook;
93	my %command;	87	my %command;
94	my %extcmd;	88	my %extcmd;
95		89
		90	#############################################################################
		91	# utility functions
		92
		93	use JSON::Syck (); # TODO# replace by JSON::PC once working
		94
		95	sub from_json($) {
		96	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
		97	JSON::Syck::Load $_[0]
		98	}
		99
		100	sub to_json($) {
		101	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
		102	JSON::Syck::Dump $_[0]
		103	}
		104
		105	#############################################################################
		106	# "new" plug-in system
		107
		108	=item $object->attach ($attachment, ...)
		109
		110	Attach a pre-registered attachment to an object.
		111
		112	=item $player->attach ($attachment, ...)
		113
		114	Attach a pre-registered attachment to a player.
		115
		116	=item $map->attach ($attachment, ...) # not yet persistent
		117
		118	Attach a pre-registered attachment to a map.
		119
		120	=item cf::attach_global ...
		121
		122	Attach handlers for global events.
		123
		124	This and all following C<attach_*>-functions expect any number of the
		125	following handler/hook descriptions:
		126
		127	=over 4
		128
		129	=item prio => $number
		130
		131	Set the priority for all following handlers/hooks (unless overwritten
		132	by another C<prio> setting). Lower priority handlers get executed
		133	earlier. The default priority is C<0>, and many built-in handlers are
		134	registered at priority C<-1000>, so lower priorities should not be used
		135	unless you know what you are doing.
		136
		137	=item on_I<event> => \&cb
		138
		139	Call the given code reference whenever the named event happens (event is
		140	something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
		141	handlers are recognised generally depends on the type of object these
		142	handlers attach to).
		143
		144	See F<include/eventinc.h> for the full list of events supported, and their
		145	class.
		146
		147	=item package => package::
		148
		149	Look for sub functions of the name C<< on_I<event> >> in the given
		150	package and register them. Only handlers for eevents supported by the
		151	object/class are recognised.
		152
		153	=back
		154
		155	=item cf::attach_to_type $object_type, ...
		156
		157	Attach handlers for a specific object type (e.g. TRANSPORT).
		158
		159	=item cf::attach_to_objects ...
		160
		161	Attach handlers to all objects. Do not use this except for debugging or
		162	very rare events, as handlers are (obviously) called for I<all> objects in
		163	the game.
		164
		165	=item cf::attach_to_players ...
		166
		167	Attach handlers to all players.
		168
		169	=item cf::attach_to_maps ...
		170
		171	Attach handlers to all maps.
		172
		173	=item cf:register_attachment $name, ...
		174
		175	=cut
		176
		177	# the following variables are defined in .xs and must not be re-created
		178	our @CB_GLOBAL = (); # registry for all global events
		179	our @CB_OBJECT = (); # all objects (should not be used except in emergency)
		180	our @CB_PLAYER = ();
		181	our @CB_TYPE = (); # registry for type (cf-object class) based events
		182	our @CB_MAP = ();
		183
		184	my %attachment;
		185
		186	sub _attach_cb($\%$$$) {
		187	my ($registry, $undo, $event, $prio, $cb) = @_;
		188
		189	use sort 'stable';
		190
		191	$cb = [$prio, $cb];
		192
		193	@{$registry->[$event]} = sort
		194	{ $a->[0] cmp $b->[0] }
		195	@{$registry->[$event] \|\| []}, $cb;
		196
		197	push @{$undo->{cb}}, [$event, $cb];
		198	}
		199
		200	# attach handles attaching event callbacks
		201	# the only thing the caller has to do is pass the correct
		202	# registry (== where the callback attaches to).
		203	sub _attach(\@$@) {
		204	my ($registry, $klass, @arg) = @_;
		205
		206	my $prio = 0;
		207
		208	my %undo = (
		209	registry => $registry,
		210	cb => [],
		211	);
		212
		213	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
		214
		215	while (@arg) {
		216	my $type = shift @arg;
		217
		218	if ($type eq "prio") {
		219	$prio = shift @arg;
		220
		221	} elsif ($type eq "package") {
		222	my $pkg = shift @arg;
		223
		224	while (my ($name, $id) = each %cb_id) {
		225	if (my $cb = $pkg->can ($name)) {
		226	_attach_cb $registry, %undo, $id, $prio, $cb;
		227	}
		228	}
		229
		230	} elsif (exists $cb_id{$type}) {
		231	_attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
		232
		233	} elsif (ref $type) {
		234	warn "attaching objects not supported, ignoring.\n";
		235
		236	} else {
		237	shift @arg;
		238	warn "attach argument '$type' not supported, ignoring.\n";
		239	}
		240	}
		241
		242	\%undo
		243	}
		244
		245	sub _attach_attachment {
		246	my ($klass, $obj, $name, @args) = q_;
		247
		248	my $res;
		249
		250	if (my $attach = $attachment{$name}) {
		251	my $registry = $obj->registry;
		252
		253	$res = _attach @$registry, $klass, @$attach;
		254
		255	if (my $cb = delete $registry->[EVENT_OBJECT_INSTANTIATE]) {
		256	for (@$cb) {
		257	eval { $_->[1]->($obj, @args); };
		258	if ($@) {
		259	warn "$@";
		260	warn "... while processing '$name' instantiate with args <@args>.\n";
		261	}
		262	}
		263	}
		264	} else {
		265	warn "object uses attachment '$name' that is not available, postponing.\n";
		266	}
		267
		268	push @{$obj->{_attachment}}, $name;
		269
		270	$res->{attachment} = $name;
		271	$res
		272	}
		273
		274	sub cf::object::attach {
		275	my ($obj, $name, @args) = @_;
		276
		277	_attach_attachment KLASS_OBJECT, $obj, $name, @args;
		278	}
		279
		280	sub cf::player::attach {
		281	my ($obj, $name, @args) = @_;
		282
		283	_attach_attachment KLASS_PLAYER, $obj, $name, @args;
		284	}
		285
		286	sub cf::map::attach {
		287	my ($obj, $name, @args) = @_;
		288
		289	_attach_attachment KLASS_MAP, $obj, $name, @args;
		290	}
		291
		292	sub attach_global {
		293	_attach @CB_GLOBAL, KLASS_GLOBAL, @_
		294	}
		295
		296	sub attach_to_type {
		297	my $type = shift;
		298
		299	_attach @{$CB_TYPE[$type]}, KLASS_OBJECT, @_
		300	}
		301
		302	sub attach_to_objects {
		303	_attach @CB_OBJECT, KLASS_OBJECT, @_
		304	}
		305
		306	sub attach_to_players {
		307	_attach @CB_PLAYER, KLASS_PLAYER, @_
		308	}
		309
		310	sub attach_to_maps {
		311	_attach @CB_MAP, KLASS_MAP, @_
		312	}
		313
		314	sub register_attachment {
		315	my $name = shift;
		316
		317	$attachment{$name} = [@_];
		318	}
		319
		320	our $override;
		321	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
		322
		323	sub override {
		324	$override = 1;
		325	@invoke_results = ();
		326	}
		327
		328	sub do_invoke {
		329	my $event = shift;
		330	my $callbacks = shift;
		331
		332	@invoke_results = ();
		333
		334	local $override;
		335
		336	for (@$callbacks) {
		337	eval { &{$_->[1]} };
		338
		339	if ($@) {
		340	warn "$@";
		341	warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
		342	override;
		343	}
		344
		345	return 1 if $override;
		346	}
		347
		348	0
		349	}
		350
		351	#############################################################################
		352	# object support
		353
		354	sub instantiate {
		355	my ($obj, $data) = @_;
		356
		357	$data = from_json $data;
		358
		359	for (@$data) {
		360	my ($name, $args) = @$_;
		361	attach $obj, $name, @{$args \|\| [] };
		362	}
		363	}
		364
		365	# basically do the same as instantiate, without calling instantiate
		366	sub reattach {
		367	warn "reattach<@_>\n";#d#
		368	my ($obj) = @_;
		369	my $registry = $obj->registry;
		370
		371	for my $name (@{ $obj->{_attachment} }) {
		372	if (my $attach = $attachment{$name}) {
		373	_attach @$registry, KLASS_OBJECT, @$attach;
		374	} else {
		375	warn "object uses attachment '$name' that is not available, postponing.\n";
		376	}
		377	}
		378
		379	warn "reattach<@_, $_>\n";
		380	}
		381
		382	sub object_freezer_save {
		383	my ($filename, $objs) = @_;
		384	warn "freeze $filename\n";#d#
		385	use Data::Dumper; print Dumper $objs;
		386
		387	$filename .= ".pst";
		388
		389	if (@$objs) {
		390	open my $fh, ">:raw", "$filename~";
		391	chmod $fh, SAVE_MODE;
		392	syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
		393	close $fh;
		394	rename "$filename~", $filename;
		395	} else {
		396	unlink $filename;
		397	}
		398	}
		399
		400	sub object_thawer_load {
		401	my ($filename) = @_;
		402
		403	warn "thaw $filename\n";#d#
		404
		405	open my $fh, "<:raw:perlio", "$filename.pst"
		406	or return;
		407
		408	eval { local $/; (Storable::thaw <$fh>)->{objs} }
		409	}
		410
		411	attach_to_objects
		412	prio => -1000000,
		413	on_clone => sub {
		414	my ($src, $dst) = @_;
		415
		416	@{$dst->registry} = @{$src->registry};
		417	warn "registry clone ", join ":", @{$src->registry};#d#
		418
		419	%$dst = %$src;
		420
		421	$dst->{_attachment} = [@{ $src->{_attachment} }]
		422	if exists $src->{_attachment};
		423
		424	warn "clone<@_>\n";#d#
		425	},
		426	;
		427
		428	#############################################################################
		429	# old plug-in events
		430
96	sub inject_event {	431	sub inject_event {
97	my $extension = shift;	432	my $extension = shift;
98	my $event_code = shift;	433	my $event_code = shift;
99		434
100	my $cb = $hook[$event_code]{$extension}	435	my $cb = $hook[$event_code]{$extension}
…		…
142	}	477	}
143		478
144	sub register {	479	sub register {
145	my ($base, $pkg) = @_;	480	my ($base, $pkg) = @_;
146		481
147	for my $idx (0 .. $#PLUGIN_EVENT) {	482	#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	}	483	}
154		484
155	sub load_extension {	485	sub load_extension {
156	my ($path) = @_;	486	my ($path) = @_;
157		487
158	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	488	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
159	my $base = $1;	489	my $base = $1;
160	my $pkg = $1;	490	my $pkg = $1;
161	$pkg =~ s/[^[:word:]]/_/g;	491	$pkg =~ s/[^[:word:]]/_/g;
162	$pkg = "cf::ext::$pkg";	492	$pkg = "ext::$pkg";
163		493
164	warn "loading '$path' into '$pkg'\n";	494	warn "loading '$path' into '$pkg'\n";
165		495
166	open my $fh, "<:utf8", $path	496	open my $fh, "<:utf8", $path
167	or die "$path: $!";	497	or die "$path: $!";
…		…
188	my ($pkg) = @_;	518	my ($pkg) = @_;
189		519
190	warn "removing extension $pkg\n";	520	warn "removing extension $pkg\n";
191		521
192	# remove hooks	522	# remove hooks
		523	#TODO
193	for my $idx (0 .. $#PLUGIN_EVENT) {	524	# for my $idx (0 .. $#PLUGIN_EVENT) {
194	delete $hook[$idx]{$pkg};	525	# delete $hook[$idx]{$pkg};
195	}	526	# }
196		527
197	# remove commands	528	# remove commands
198	for my $name (keys %command) {	529	for my $name (keys %command) {
199	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };	530	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
200		531
…		…
210	# remove extcmds	541	# remove extcmds
211	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {	542	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
212	delete $extcmd{$name};	543	delete $extcmd{$name};
213	}	544	}
214		545
215	if (my $cb = $pkg->can ("on_unload")) {	546	if (my $cb = $pkg->can ("unload")) {
216	eval {	547	eval {
217	$cb->($pkg);	548	$cb->($pkg);
218	1	549	1
219	} or warn "$pkg unloaded, but with errors: $@";	550	} or warn "$pkg unloaded, but with errors: $@";
220	}	551	}
…		…
264	}	595	}
265		596
266	Symbol::delete_package $k;	597	Symbol::delete_package $k;
267	}	598	}
268		599
269	# 4. get rid of ext::, as good as possible	600	# 4. get rid of safe::, as good as possible
270	Symbol::delete_package "ext::$_"	601	Symbol::delete_package "safe::$_"
271	for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);	602	for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
272		603
273	# 5. remove register_script_function callbacks	604	# 5. remove register_script_function callbacks
274	# TODO	605	# TODO
275		606
276	# 6. unload cf.pm "a bit"	607	# 6. unload cf.pm "a bit"
277	delete $INC{"cf.pm"};	608	delete $INC{"cf.pm"};
278		609
279	# don't, removes xs symbols, too	610	# don't, removes xs symbols, too,
		611	# and global variables created in xs
280	#Symbol::delete_package __PACKAGE__;	612	#Symbol::delete_package __PACKAGE__;
281		613
282	# 7. reload cf.pm	614	# 7. reload cf.pm
283	$msg->("reloading cf.pm");	615	$msg->("reloading cf.pm");
284	require cf;	616	require cf;
…		…
305	};	637	};
306	}	638	}
307	};	639	};
308		640
309	#############################################################################	641	#############################################################################
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>	642	# extcmd framework, basically convert ext <msg>
326	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few	643	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
327		644
328	sub on_extcmd {	645	attach_to_players
		646	on_extcmd => sub {
329	my ($pl, $buf) = @_;	647	my ($pl, $buf) = @_;
330		648
331	my $msg = eval { from_json $buf };	649	my $msg = eval { from_json $buf };
332		650
333	if (ref $msg) {	651	if (ref $msg) {
334	if (my $cb = $extcmd{$msg->{msgtype}}) {	652	if (my $cb = $extcmd{$msg->{msgtype}}) {
335	if (my %reply = $cb->[0]->($pl, $msg)) {	653	if (my %reply = $cb->[0]->($pl, $msg)) {
336	$pl->ext_reply ($msg->{msgid}, %reply);	654	$pl->ext_reply ($msg->{msgid}, %reply);
		655	}
		656	}
		657	} else {
		658	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
		659	}
		660
		661	cf::override;
		662	},
		663	;
		664
		665	#############################################################################
		666	# load/save/clean perl data associated with a map
		667
		668	*cf::mapsupport::on_clean = sub {
		669	my ($map) = @_;
		670
		671	my $path = $map->tmpname;
		672	defined $path or return;
		673
		674	unlink "$path.cfperl";
		675	unlink "$path.pst";
		676	};
		677
		678	*cf::mapsupport::on_swapin =
		679	*cf::mapsupport::on_load = sub {
		680	my ($map) = @_;
		681
		682	my $path = $map->tmpname;
		683	$path = $map->path unless defined $path;
		684
		685	open my $fh, "<:raw", "$path.cfperl"
		686	or return; # no perl data
		687
		688	my $data = Storable::thaw do { local $/; <$fh> };
		689
		690	$data->{version} <= 1
		691	or return; # too new
		692
		693	$map->_set_obs ($data->{obs});
		694	};
		695
		696	attach_to_maps prio => -10000, package => cf::mapsupport::;
		697
		698	#############################################################################
		699	# load/save perl data associated with player->ob objects
		700
		701	sub all_objects(@) {
		702	@_, map all_objects ($_->inv), @_
		703	}
		704
		705	attach_to_players
		706	on_load => sub {
		707	my ($pl, $path) = @_;
		708
		709	for my $o (all_objects $pl->ob) {
		710	if (my $value = $o->get_ob_key_value ("_perl_data")) {
		711	$o->set_ob_key_value ("_perl_data");
		712
		713	%$o = %{ Storable::thaw pack "H*", $value };
337	}	714	}
338	}	715	}
339	} else {
340	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
341	}	716	},
342		717	;
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		718
429	#############################################################################	719	#############################################################################
430	# core extensions - in perl	720	# core extensions - in perl
431		721
432	=item cf::player::exists $login	722	=item cf::player::exists $login
…		…
478	}	768	}
479		769
480	#############################################################################	770	#############################################################################
481	# map scripting support	771	# map scripting support
482		772
483	our $safe = new Safe "ext";	773	our $safe = new Safe "safe";
484	our $safe_hole = new Safe::Hole;	774	our $safe_hole = new Safe::Hole;
485		775
486	$SIG{FPE} = 'IGNORE';	776	$SIG{FPE} = 'IGNORE';
487		777
488	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	778	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
…		…
494	["cf::object::player" => qw(player)],	784	["cf::object::player" => qw(player)],
495	["cf::player" => qw(peaceful)],	785	["cf::player" => qw(peaceful)],
496	) {	786	) {
497	no strict 'refs';	787	no strict 'refs';
498	my ($pkg, @funs) = @$_;	788	my ($pkg, @funs) = @$_;
499	*{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	789	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
500	for @funs;	790	for @funs;
501	}	791	}
502		792
503	sub safe_eval($;@) {	793	sub safe_eval($;@) {
504	my ($code, %vars) = @_;	794	my ($code, %vars) = @_;
…		…
506	my $qcode = $code;	796	my $qcode = $code;
507	$qcode =~ s/"/‟/g; # not allowed in #line filenames	797	$qcode =~ s/"/‟/g; # not allowed in #line filenames
508	$qcode =~ s/\n/\\n/g;	798	$qcode =~ s/\n/\\n/g;
509		799
510	local $_;	800	local $_;
511	local @ext::cf::_safe_eval_args = values %vars;	801	local @safe::cf::_safe_eval_args = values %vars;
512		802
513	$code =	803	my $eval =
514	"do {\n"	804	"do {\n"
515	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	805	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
516	. "#line 0 \"{$qcode}\"\n"	806	. "#line 0 \"{$qcode}\"\n"
517	. $code	807	. $code
518	. "\n}"	808	. "\n}"
519	;	809	;
520		810
521	sub_generation_inc;	811	sub_generation_inc;
522	my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code);	812	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
523	sub_generation_inc;	813	sub_generation_inc;
		814
		815	if ($@) {
		816	warn "$@";
		817	warn "while executing safe code '$code'\n";
		818	warn "with arguments " . (join " ", %vars) . "\n";
		819	}
524		820
525	wantarray ? @res : $res[0]	821	wantarray ? @res : $res[0]
526	}	822	}
527		823
528	sub register_script_function {	824	sub register_script_function {
529	my ($fun, $cb) = @_;	825	my ($fun, $cb) = @_;
530		826
531	no strict 'refs';	827	no strict 'refs';
532	*{"ext::$fun"} = $safe_hole->wrap ($cb);	828	*{"safe::$fun"} = $safe_hole->wrap ($cb);
533	}	829	}
534		830
535	#############################################################################	831	#############################################################################
536	# the server's main()	832	# the server's main()
537		833
538	sub run {	834	sub main {
539	Event::loop;	835	Event::loop;
540	}	836	}
541		837
542	#############################################################################	838	#############################################################################
543	# initialisation	839	# initialisation

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.46 by root, Sun Aug 27 16:15:12 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.46 by root, Sun Aug 27 16:15:12 2006 UTC