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

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

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.37 by root, Thu Aug 24 14:05:22 2006 UTC vs. Revision 1.50 by root, Mon Aug 28 07:07:42 2006 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.37 by root, Thu Aug 24 14:05:22 2006 UTC vs.
Revision 1.50 by root, Mon Aug 28 07:07:42 2006 UTC