[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.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	@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)) {
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, ...)
		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.
		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, @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
		281	sub cf::object::attach {
		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;
		297	}
		298
		299	sub attach_global {
		300	_attach @CB_GLOBAL, KLASS_GLOBAL, @_
		301	}
		302
		303	sub attach_to_type {
		304	my $type = shift;
		305	my $subtype = shift;
		306
		307	_attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
		308	}
		309
		310	sub attach_to_objects {
		311	_attach @CB_OBJECT, KLASS_OBJECT, @_
		312	}
		313
		314	sub attach_to_players {
		315	_attach @CB_PLAYER, KLASS_PLAYER, @_
		316	}
		317
		318	sub attach_to_maps {
		319	_attach @CB_MAP, KLASS_MAP, @_
		320	}
		321
		322	sub register_attachment {
		323	my $name = shift;
		324
		325	$attachment{$name} = [[KLASS_OBJECT, @_]];
		326	}
		327
		328	our $override;
		329	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
		330
		331	sub override {
		332	$override = 1;
		333	@invoke_results = ();
		334	}
		335
		336	sub do_invoke {
		337	my $event = shift;
		338	my $callbacks = shift;
		339
		340	@invoke_results = ();
		341
		342	local $override;
		343
		344	for (@$callbacks) {
		345	eval { &{$_->[1]} };
		346
		347	if ($@) {
		348	warn "$@";
		349	warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
		350	override;
		351	}
		352
		353	return 1 if $override;
		354	}
		355
		356	0
		357	}
		358
		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	#############################################################################
		432	# old plug-in events
		433
96	sub inject_event {	434	sub inject_event {
97	my $extension = shift;	435	my $extension = shift;
98	my $event_code = shift;	436	my $event_code = shift;
99		437
100	my $cb = $hook[$event_code]{$extension}	438	my $cb = $hook[$event_code]{$extension}
…		…
142	}	480	}
143		481
144	sub register {	482	sub register {
145	my ($base, $pkg) = @_;	483	my ($base, $pkg) = @_;
146		484
147	for my $idx (0 .. $#PLUGIN_EVENT) {	485	#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	}	486	}
154		487
155	sub load_extension {	488	sub load_extension {
156	my ($path) = @_;	489	my ($path) = @_;
157		490
158	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	491	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
159	my $base = $1;	492	my $base = $1;
160	my $pkg = $1;	493	my $pkg = $1;
161	$pkg =~ s/[^[:word:]]/_/g;	494	$pkg =~ s/[^[:word:]]/_/g;
162	$pkg = "cf::ext::$pkg";	495	$pkg = "ext::$pkg";
163		496
164	warn "loading '$path' into '$pkg'\n";	497	warn "loading '$path' into '$pkg'\n";
165		498
166	open my $fh, "<:utf8", $path	499	open my $fh, "<:utf8", $path
167	or die "$path: $!";	500	or die "$path: $!";
…		…
188	my ($pkg) = @_;	521	my ($pkg) = @_;
189		522
190	warn "removing extension $pkg\n";	523	warn "removing extension $pkg\n";
191		524
192	# remove hooks	525	# remove hooks
		526	#TODO
193	for my $idx (0 .. $#PLUGIN_EVENT) {	527	# for my $idx (0 .. $#PLUGIN_EVENT) {
194	delete $hook[$idx]{$pkg};	528	# delete $hook[$idx]{$pkg};
195	}	529	# }
196		530
197	# remove commands	531	# remove commands
198	for my $name (keys %command) {	532	for my $name (keys %command) {
199	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };	533	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
200		534
…		…
210	# remove extcmds	544	# remove extcmds
211	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {	545	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
212	delete $extcmd{$name};	546	delete $extcmd{$name};
213	}	547	}
214		548
215	if (my $cb = $pkg->can ("on_unload")) {	549	if (my $cb = $pkg->can ("unload")) {
216	eval {	550	eval {
217	$cb->($pkg);	551	$cb->($pkg);
218	1	552	1
219	} or warn "$pkg unloaded, but with errors: $@";	553	} or warn "$pkg unloaded, but with errors: $@";
220	}	554	}
…		…
264	}	598	}
265		599
266	Symbol::delete_package $k;	600	Symbol::delete_package $k;
267	}	601	}
268		602
269	# 4. get rid of ext::, as good as possible	603	# 4. get rid of safe::, as good as possible
270	Symbol::delete_package "ext::$_"	604	Symbol::delete_package "safe::$_"
271	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);
272		606
273	# 5. remove register_script_function callbacks	607	# 5. remove register_script_function callbacks
274	# TODO	608	# TODO
275		609
276	# 6. unload cf.pm "a bit"	610	# 6. unload cf.pm "a bit"
277	delete $INC{"cf.pm"};	611	delete $INC{"cf.pm"};
278		612
279	# don't, removes xs symbols, too	613	# don't, removes xs symbols, too,
		614	# and global variables created in xs
280	#Symbol::delete_package __PACKAGE__;	615	#Symbol::delete_package __PACKAGE__;
281		616
282	# 7. reload cf.pm	617	# 7. reload cf.pm
283	$msg->("reloading cf.pm");	618	$msg->("reloading cf.pm");
284	require cf;	619	require cf;
…		…
305	};	640	};
306	}	641	}
307	};	642	};
308		643
309	#############################################################################	644	#############################################################################
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>	645	# extcmd framework, basically convert ext <msg>
326	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few	646	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
327		647
328	sub on_extcmd {	648	attach_to_players
		649	on_extcmd => sub {
329	my ($pl, $buf) = @_;	650	my ($pl, $buf) = @_;
330		651
331	my $msg = eval { from_json $buf };	652	my $msg = eval { from_json $buf };
332		653
333	if (ref $msg) {	654	if (ref $msg) {
334	if (my $cb = $extcmd{$msg->{msgtype}}) {	655	if (my $cb = $extcmd{$msg->{msgtype}}) {
335	if (my %reply = $cb->[0]->($pl, $msg)) {	656	if (my %reply = $cb->[0]->($pl, $msg)) {
336	$pl->ext_reply ($msg->{msgid}, %reply);	657	$pl->ext_reply ($msg->{msgid}, %reply);
		658	}
337	}	659	}
338	}
339	} else {	660	} else {
340	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	661	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
		662	}
		663
		664	cf::override;
341	}	665	},
342		666	;
343	1
344	}
345		667
346	#############################################################################	668	#############################################################################
347	# load/save/clean perl data associated with a map	669	# load/save/clean perl data associated with a map
348		670
349	*on_mapclean = sub {	671	*cf::mapsupport::on_clean = sub {
350	my ($map) = @_;	672	my ($map) = @_;
351		673
352	my $path = $map->tmpname;	674	my $path = $map->tmpname;
353	defined $path or return;	675	defined $path or return;
354		676
355	unlink "$path.cfperl";	677	unlink "$path.cfperl";
		678	unlink "$path.pst";
356	};	679	};
357		680
358	*on_mapin =	681	*cf::mapsupport::on_swapin =
359	*on_mapload = sub {	682	*cf::mapsupport::on_load = sub {
360	my ($map) = @_;	683	my ($map) = @_;
361		684
362	my $path = $map->tmpname;	685	my $path = $map->tmpname;
363	$path = $map->path unless defined $path;	686	$path = $map->path unless defined $path;
364		687
…		…
371	or return; # too new	694	or return; # too new
372		695
373	$map->_set_obs ($data->{obs});	696	$map->_set_obs ($data->{obs});
374	};	697	};
375		698
376	*on_mapout = sub {	699	attach_to_maps prio => -10000, package => cf::mapsupport::;
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		700
403	#############################################################################	701	#############################################################################
404	# load/save perl data associated with player->ob objects	702	# load/save perl data associated with player->ob objects
405		703
406	sub all_objects(@) {	704	sub all_objects(@) {
407	@_, map all_objects ($_->inv), @_	705	@_, map all_objects ($_->inv), @_
408	}	706	}
409		707
410	*on_player_load = sub {	708	attach_to_players
		709	on_load => sub {
411	my ($ob, $path) = @_;	710	my ($pl, $path) = @_;
412		711
413	for my $o (all_objects $ob) {	712	for my $o (all_objects $pl->ob) {
414	if (my $value = $o->get_ob_key_value ("_perl_data")) {	713	if (my $value = $o->get_ob_key_value ("_perl_data")) {
415	$o->set_ob_key_value ("_perl_data");	714	$o->set_ob_key_value ("_perl_data");
416		715
417	%$o = %{ Storable::thaw pack "H*", $value };	716	%$o = %{ Storable::thaw pack "H*", $value };
418	}	717	}
		718	}
419	}	719	},
420	};	720	;
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		721
429	#############################################################################	722	#############################################################################
430	# core extensions - in perl	723	# core extensions - in perl
431		724
432	=item cf::player::exists $login	725	=item cf::player::exists $login
…		…
478	}	771	}
479		772
480	#############################################################################	773	#############################################################################
481	# map scripting support	774	# map scripting support
482		775
483	our $safe = new Safe "ext";	776	our $safe = new Safe "safe";
484	our $safe_hole = new Safe::Hole;	777	our $safe_hole = new Safe::Hole;
485		778
486	$SIG{FPE} = 'IGNORE';	779	$SIG{FPE} = 'IGNORE';
487		780
488	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	781	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
…		…
494	["cf::object::player" => qw(player)],	787	["cf::object::player" => qw(player)],
495	["cf::player" => qw(peaceful)],	788	["cf::player" => qw(peaceful)],
496	) {	789	) {
497	no strict 'refs';	790	no strict 'refs';
498	my ($pkg, @funs) = @$_;	791	my ($pkg, @funs) = @$_;
499	*{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	792	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
500	for @funs;	793	for @funs;
501	}	794	}
502		795
503	sub safe_eval($;@) {	796	sub safe_eval($;@) {
504	my ($code, %vars) = @_;	797	my ($code, %vars) = @_;
…		…
506	my $qcode = $code;	799	my $qcode = $code;
507	$qcode =~ s/"/‟/g; # not allowed in #line filenames	800	$qcode =~ s/"/‟/g; # not allowed in #line filenames
508	$qcode =~ s/\n/\\n/g;	801	$qcode =~ s/\n/\\n/g;
509		802
510	local $_;	803	local $_;
511	local @ext::cf::_safe_eval_args = values %vars;	804	local @safe::cf::_safe_eval_args = values %vars;
512		805
513	$code =	806	my $eval =
514	"do {\n"	807	"do {\n"
515	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	808	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
516	. "#line 0 \"{$qcode}\"\n"	809	. "#line 0 \"{$qcode}\"\n"
517	. $code	810	. $code
518	. "\n}"	811	. "\n}"
519	;	812	;
520		813
521	sub_generation_inc;	814	sub_generation_inc;
522	my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code);	815	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
523	sub_generation_inc;	816	sub_generation_inc;
		817
		818	if ($@) {
		819	warn "$@";
		820	warn "while executing safe code '$code'\n";
		821	warn "with arguments " . (join " ", %vars) . "\n";
		822	}
524		823
525	wantarray ? @res : $res[0]	824	wantarray ? @res : $res[0]
526	}	825	}
527		826
528	sub register_script_function {	827	sub register_script_function {
529	my ($fun, $cb) = @_;	828	my ($fun, $cb) = @_;
530		829
531	no strict 'refs';	830	no strict 'refs';
532	*{"ext::$fun"} = $safe_hole->wrap ($cb);	831	*{"safe::$fun"} = $safe_hole->wrap ($cb);
533	}	832	}
534		833
535	#############################################################################	834	#############################################################################
536	# the server's main()	835	# the server's main()
537		836
538	sub run {	837	sub main {
539	Event::loop;	838	Event::loop;
540	}	839	}
541		840
542	#############################################################################	841	#############################################################################
543	# initialisation	842	# initialisation
…		…
563	$TICK_WATCHER->at ($NEXT_TICK);	862	$TICK_WATCHER->at ($NEXT_TICK);
564	$TICK_WATCHER->start;	863	$TICK_WATCHER->start;
565	},	864	},
566	);	865	);
567		866
		867	_reload_2;
		868
568	1	869	1
569		870

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.47 by root, Sun Aug 27 13:02:04 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.47 by root, Sun Aug 27 13:02:04 2006 UTC