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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.40 by root, Fri Aug 25 15:21:57 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	};
…		…
92	my @hook;	88	my @hook;
93	my %command;	89	my %command;
94	my %extcmd;	90	my %extcmd;
95		91
96	#############################################################################	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	#############################################################################
97	# "new" plug-in system	108	# "new" plug-in system
98		109
99	=item cf::object::attach ... # NYI	110	=item $object->attach ($attachment, ...)
		111
		112	Attach a pre-registered attachment to an object.
		113
		114	=item $player->attach ($attachment, ...)
		115
		116	Attach a pre-registered attachment to a player.
		117
		118	=item $map->attach ($attachment, ...) # not yet persistent
		119
		120	Attach a pre-registered attachment to a map.
100		121
101	=item cf::attach_global ...	122	=item cf::attach_global ...
102		123
103	=item cf::attach_to_type ...	124	Attach handlers for global events.
		125
		126	This and all following C<attach_*>-functions expect any number of the
		127	following handler/hook descriptions:
		128
		129	=over 4
		130
		131	=item prio => $number
		132
		133	Set the priority for all following handlers/hooks (unless overwritten
		134	by another C<prio> setting). Lower priority handlers get executed
		135	earlier. The default priority is C<0>, and many built-in handlers are
		136	registered at priority C<-1000>, so lower priorities should not be used
		137	unless you know what you are doing.
		138
		139	=item on_I<event> => \&cb
		140
		141	Call the given code reference whenever the named event happens (event is
		142	something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
		143	handlers are recognised generally depends on the type of object these
		144	handlers attach to).
		145
		146	See F<include/eventinc.h> for the full list of events supported, and their
		147	class.
		148
		149	=item package => package::
		150
		151	Look for sub functions of the name C<< on_I<event> >> in the given
		152	package and register them. Only handlers for eevents supported by the
		153	object/class are recognised.
		154
		155	=back
		156
		157	=item cf::attach_to_type $object_type, $subtype, ...
		158
		159	Attach handlers for a specific object type (e.g. TRANSPORT) and
		160	subtype. If C<$subtype> is zero or undef, matches all objects of the given
		161	type.
104		162
105	=item cf::attach_to_objects ...	163	=item cf::attach_to_objects ...
106		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
107	=item cf::attach_to_players ...	169	=item cf::attach_to_players ...
108		170
		171	Attach handlers to all players.
		172
109	=item cf::attach_to_maps ...	173	=item cf::attach_to_maps ...
110		174
111	prio => $number, # lower is earlier	175	Attach handlers to all maps.
112	on_xxx => \&cb,	176
113	package => package::,	177	=item cf:register_attachment $name, ...
114		178
115	=cut	179	=cut
116		180
117	# the following variables are defined in .xs and must not be re-created	181	# the following variables are defined in .xs and must not be re-created
118	our @CB_GLOBAL = (); # registry for all global events	182	our @CB_GLOBAL = (); # registry for all global events
119	our @CB_OBJECT = ();	183	our @CB_OBJECT = (); # all objects (should not be used except in emergency)
120	our @CB_PLAYER = ();	184	our @CB_PLAYER = ();
121	our @CB_TYPE = (); # registry for type (cf-object class) based events	185	our @CB_TYPE = (); # registry for type (cf-object class) based events
122	our @CB_MAP = ();	186	our @CB_MAP = ();
123		187
		188	my %attachment;
		189
124	sub _attach_cb($\%$$$) {	190	sub _attach_cb($\%$$$) {
125	my ($registry, $undo, $event, $prio, $cb) = @_;	191	my ($registry, $undo, $event, $prio, $cb) = @_;
126		192
127	use sort 'stable';	193	use sort 'stable';
128		194
…		…
136	}	202	}
137		203
138	# attach handles attaching event callbacks	204	# attach handles attaching event callbacks
139	# the only thing the caller has to do is pass the correct	205	# the only thing the caller has to do is pass the correct
140	# registry (== where the callback attaches to).	206	# registry (== where the callback attaches to).
141	sub _attach(\@$\@) {	207	sub _attach(\@$@) {
142	my ($registry, $klass, $arg) = @_;	208	my ($registry, $klass, @arg) = @_;
143		209
144	my $prio = 0;	210	my $prio = 0;
145		211
146	my %undo = (	212	my %undo = (
147	registry => $registry,	213	registry => $registry,
148	cb => [],	214	cb => [],
149	);	215	);
150		216
151	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;	217	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
152		218
153	while (@$arg) {	219	while (@arg) {
154	my $type = shift @$arg;	220	my $type = shift @arg;
155		221
156	if ($type eq "prio") {	222	if ($type eq "prio") {
157	$prio = shift @$arg;	223	$prio = shift @arg;
158		224
159	} elsif ($type eq "package") {	225	} elsif ($type eq "package") {
160	my $pkg = shift @$arg;	226	my $pkg = shift @arg;
161		227
162	while (my ($name, $id) = each %cb_id) {	228	while (my ($name, $id) = each %cb_id) {
163	if (my $cb = $pkg->can ($name)) {	229	if (my $cb = $pkg->can ($name)) {
164	_attach_cb $registry, %undo, $id, $prio, $cb;	230	_attach_cb $registry, %undo, $id, $prio, $cb;
165	}	231	}
166	}	232	}
167		233
168	} elsif (exists $cb_id{$type}) {	234	} elsif (exists $cb_id{$type}) {
169	_attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @$arg;	235	_attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
170		236
171	} elsif (ref $type) {	237	} elsif (ref $type) {
172	warn "attaching objects not supported, ignoring.\n";	238	warn "attaching objects not supported, ignoring.\n";
173		239
174	} else {	240	} else {
175	shift @$arg;	241	shift @arg;
176	warn "attach argument '$type' not supported, ignoring.\n";	242	warn "attach argument '$type' not supported, ignoring.\n";
177	}	243	}
178	}	244	}
179		245
180	\%undo	246	\%undo
181	}	247	}
182		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
183	sub cf::object::attach {	281	sub cf::object::attach {
184	die;	282	my ($obj, $name, @args) = @_;
		283
		284	_attach_attachment $obj, $name, @args;
		285	}
		286
		287	sub cf::player::attach {
		288	my ($obj, $name, @args) = @_;
		289
		290	_attach_attachment KLASS_PLAYER, $obj, $name, @args;
		291	}
		292
		293	sub cf::map::attach {
		294	my ($obj, $name, @args) = @_;
		295
		296	_attach_attachment KLASS_MAP, $obj, $name, @args;
185	}	297	}
186		298
187	sub attach_global {	299	sub attach_global {
188	_attach @CB_GLOBAL, KLASS_GLOBAL, @_	300	_attach @CB_GLOBAL, KLASS_GLOBAL, @_
189	}	301	}
190		302
191	sub attach_to_type {	303	sub attach_to_type {
192	my $type = shift;	304	my $type = shift;
		305	my $subtype = shift;
		306
193	_attach @{$CB_TYPE[$type]}, KLASS_OBJECT, @_	307	_attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
194	}	308	}
195		309
196	sub attach_to_objects {	310	sub attach_to_objects {
197	_attach @CB_OBJECT, KLASS_OBJECT, @_	311	_attach @CB_OBJECT, KLASS_OBJECT, @_
198	}	312	}
…		…
203		317
204	sub attach_to_maps {	318	sub attach_to_maps {
205	_attach @CB_MAP, KLASS_MAP, @_	319	_attach @CB_MAP, KLASS_MAP, @_
206	}	320	}
207		321
		322	sub register_attachment {
		323	my $name = shift;
		324
		325	$attachment{$name} = [[KLASS_OBJECT, @_]];
		326	}
		327
208	our $override;	328	our $override;
		329	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
209		330
210	sub override() {	331	sub override {
211	$override = 1	332	$override = 1;
		333	@invoke_results = ();
212	}	334	}
213		335
214	sub invoke {	336	sub do_invoke {
215	my $event = shift;	337	my $event = shift;
216	my $callbacks = shift;	338	my $callbacks = shift;
		339
		340	@invoke_results = ();
217		341
218	local $override;	342	local $override;
219		343
220	for (@$callbacks) {	344	for (@$callbacks) {
221	eval { &{$_->[1]} };	345	eval { &{$_->[1]} };
…		…
231		355
232	0	356	0
233	}	357	}
234		358
235	#############################################################################	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	#############################################################################
236	# old plug-in events	432	# old plug-in events
237		433
238	sub inject_event {	434	sub inject_event {
239	my $extension = shift;	435	my $extension = shift;
240	my $event_code = shift;	436	my $event_code = shift;
…		…
284	}	480	}
285		481
286	sub register {	482	sub register {
287	my ($base, $pkg) = @_;	483	my ($base, $pkg) = @_;
288		484
289	for my $idx (0 .. $#PLUGIN_EVENT) {	485	#TODO
290	if (my $ref = $pkg->can ("on_$PLUGIN_EVENT[$idx]")) {
291	#warn "registering $PLUGIN_EVENT[$idx] hook to '$pkg'\n";
292	$hook[$idx]{$base} = $ref;
293	}
294	}
295	}	486	}
296		487
297	sub load_extension {	488	sub load_extension {
298	my ($path) = @_;	489	my ($path) = @_;
299		490
300	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	491	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
301	my $base = $1;	492	my $base = $1;
302	my $pkg = $1;	493	my $pkg = $1;
303	$pkg =~ s/[^[:word:]]/_/g;	494	$pkg =~ s/[^[:word:]]/_/g;
304	$pkg = "cf::ext::$pkg";	495	$pkg = "ext::$pkg";
305		496
306	warn "loading '$path' into '$pkg'\n";	497	warn "loading '$path' into '$pkg'\n";
307		498
308	open my $fh, "<:utf8", $path	499	open my $fh, "<:utf8", $path
309	or die "$path: $!";	500	or die "$path: $!";
…		…
330	my ($pkg) = @_;	521	my ($pkg) = @_;
331		522
332	warn "removing extension $pkg\n";	523	warn "removing extension $pkg\n";
333		524
334	# remove hooks	525	# remove hooks
		526	#TODO
335	for my $idx (0 .. $#PLUGIN_EVENT) {	527	# for my $idx (0 .. $#PLUGIN_EVENT) {
336	delete $hook[$idx]{$pkg};	528	# delete $hook[$idx]{$pkg};
337	}	529	# }
338		530
339	# remove commands	531	# remove commands
340	for my $name (keys %command) {	532	for my $name (keys %command) {
341	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };	533	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
342		534
…		…
352	# remove extcmds	544	# remove extcmds
353	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {	545	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
354	delete $extcmd{$name};	546	delete $extcmd{$name};
355	}	547	}
356		548
357	if (my $cb = $pkg->can ("on_unload")) {	549	if (my $cb = $pkg->can ("unload")) {
358	eval {	550	eval {
359	$cb->($pkg);	551	$cb->($pkg);
360	1	552	1
361	} or warn "$pkg unloaded, but with errors: $@";	553	} or warn "$pkg unloaded, but with errors: $@";
362	}	554	}
…		…
406	}	598	}
407		599
408	Symbol::delete_package $k;	600	Symbol::delete_package $k;
409	}	601	}
410		602
411	# 4. get rid of ext::, as good as possible	603	# 4. get rid of safe::, as good as possible
412	Symbol::delete_package "ext::$_"	604	Symbol::delete_package "safe::$_"
413	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);
414		606
415	# 5. remove register_script_function callbacks	607	# 5. remove register_script_function callbacks
416	# TODO	608	# TODO
417		609
418	# 6. unload cf.pm "a bit"	610	# 6. unload cf.pm "a bit"
419	delete $INC{"cf.pm"};	611	delete $INC{"cf.pm"};
420		612
421	# don't, removes xs symbols, too	613	# don't, removes xs symbols, too,
		614	# and global variables created in xs
422	#Symbol::delete_package __PACKAGE__;	615	#Symbol::delete_package __PACKAGE__;
423		616
424	# 7. reload cf.pm	617	# 7. reload cf.pm
425	$msg->("reloading cf.pm");	618	$msg->("reloading cf.pm");
426	require cf;	619	require cf;
…		…
447	};	640	};
448	}	641	}
449	};	642	};
450		643
451	#############################################################################	644	#############################################################################
452	# utility functions
453
454	use JSON::Syck (); # TODO# replace by JSON::PC once working
455
456	sub from_json($) {
457	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
458	JSON::Syck::Load $_[0]
459	}
460
461	sub to_json($) {
462	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
463	JSON::Syck::Dump $_[0]
464	}
465
466	#############################################################################
467	# extcmd framework, basically convert ext <msg>	645	# extcmd framework, basically convert ext <msg>
468	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few	646	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
469		647
470	sub on_extcmd {	648	attach_to_players
		649	on_extcmd => sub {
471	my ($pl, $buf) = @_;	650	my ($pl, $buf) = @_;
472		651
473	my $msg = eval { from_json $buf };	652	my $msg = eval { from_json $buf };
474		653
475	if (ref $msg) {	654	if (ref $msg) {
476	if (my $cb = $extcmd{$msg->{msgtype}}) {	655	if (my $cb = $extcmd{$msg->{msgtype}}) {
477	if (my %reply = $cb->[0]->($pl, $msg)) {	656	if (my %reply = $cb->[0]->($pl, $msg)) {
478	$pl->ext_reply ($msg->{msgid}, %reply);	657	$pl->ext_reply ($msg->{msgid}, %reply);
		658	}
479	}	659	}
480	}
481	} else {	660	} else {
482	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;
483	}	665	},
484		666	;
485	1
486	}
487		667
488	#############################################################################	668	#############################################################################
489	# load/save/clean perl data associated with a map	669	# load/save/clean perl data associated with a map
490		670
491	*cf::mapsupport::on_clean = sub {	671	*cf::mapsupport::on_clean = sub {
…		…
493		673
494	my $path = $map->tmpname;	674	my $path = $map->tmpname;
495	defined $path or return;	675	defined $path or return;
496		676
497	unlink "$path.cfperl";	677	unlink "$path.cfperl";
		678	unlink "$path.pst";
498	};	679	};
499		680
500	*cf::mapsupport::on_swapin =	681	*cf::mapsupport::on_swapin =
501	*cf::mapsupport::on_load = sub {	682	*cf::mapsupport::on_load = sub {
502	my ($map) = @_;	683	my ($map) = @_;
…		…
513	or return; # too new	694	or return; # too new
514		695
515	$map->_set_obs ($data->{obs});	696	$map->_set_obs ($data->{obs});
516	};	697	};
517		698
518	*cf::mapsupport::on_swapout = sub {
519	my ($map) = @_;
520
521	my $path = $map->tmpname;
522	$path = $map->path unless defined $path;
523
524	my $obs = $map->_get_obs;
525
526	if (defined $obs) {
527	open my $fh, ">:raw", "$path.cfperl"
528	or die "$path.cfperl: $!";
529
530	stat $path;
531
532	print $fh Storable::nfreeze {
533	size => (stat _)[7],
534	time => (stat _)[9],
535	version => 1,
536	obs => $obs,
537	};
538
539	chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible g
540	} else {
541	unlink "$path.cfperl";
542	}
543	};
544
545	attach_to_maps prio => -10000, package => cf::mapsupport::;	699	attach_to_maps prio => -10000, package => cf::mapsupport::;
546		700
547	#############################################################################	701	#############################################################################
548	# load/save perl data associated with player->ob objects	702	# load/save perl data associated with player->ob objects
549		703
…		…
560	$o->set_ob_key_value ("_perl_data");	714	$o->set_ob_key_value ("_perl_data");
561		715
562	%$o = %{ Storable::thaw pack "H*", $value };	716	%$o = %{ Storable::thaw pack "H*", $value };
563	}	717	}
564	}	718	}
565	},
566	on_save => sub {
567	my ($pl, $path) = @_;
568
569	$_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
570	for grep %$_, all_objects $pl->ob;
571	},	719	},
572	;	720	;
573		721
574	#############################################################################	722	#############################################################################
575	# core extensions - in perl	723	# core extensions - in perl
…		…
623	}	771	}
624		772
625	#############################################################################	773	#############################################################################
626	# map scripting support	774	# map scripting support
627		775
628	our $safe = new Safe "ext";	776	our $safe = new Safe "safe";
629	our $safe_hole = new Safe::Hole;	777	our $safe_hole = new Safe::Hole;
630		778
631	$SIG{FPE} = 'IGNORE';	779	$SIG{FPE} = 'IGNORE';
632		780
633	$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));
…		…
639	["cf::object::player" => qw(player)],	787	["cf::object::player" => qw(player)],
640	["cf::player" => qw(peaceful)],	788	["cf::player" => qw(peaceful)],
641	) {	789	) {
642	no strict 'refs';	790	no strict 'refs';
643	my ($pkg, @funs) = @$_;	791	my ($pkg, @funs) = @$_;
644	*{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	792	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
645	for @funs;	793	for @funs;
646	}	794	}
647		795
648	sub safe_eval($;@) {	796	sub safe_eval($;@) {
649	my ($code, %vars) = @_;	797	my ($code, %vars) = @_;
…		…
651	my $qcode = $code;	799	my $qcode = $code;
652	$qcode =~ s/"/‟/g; # not allowed in #line filenames	800	$qcode =~ s/"/‟/g; # not allowed in #line filenames
653	$qcode =~ s/\n/\\n/g;	801	$qcode =~ s/\n/\\n/g;
654		802
655	local $_;	803	local $_;
656	local @ext::cf::_safe_eval_args = values %vars;	804	local @safe::cf::_safe_eval_args = values %vars;
657		805
658	$code =	806	my $eval =
659	"do {\n"	807	"do {\n"
660	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	808	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
661	. "#line 0 \"{$qcode}\"\n"	809	. "#line 0 \"{$qcode}\"\n"
662	. $code	810	. $code
663	. "\n}"	811	. "\n}"
664	;	812	;
665		813
666	sub_generation_inc;	814	sub_generation_inc;
667	my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code);	815	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
668	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	}
669		823
670	wantarray ? @res : $res[0]	824	wantarray ? @res : $res[0]
671	}	825	}
672		826
673	sub register_script_function {	827	sub register_script_function {
674	my ($fun, $cb) = @_;	828	my ($fun, $cb) = @_;
675		829
676	no strict 'refs';	830	no strict 'refs';
677	*{"ext::$fun"} = $safe_hole->wrap ($cb);	831	*{"safe::$fun"} = $safe_hole->wrap ($cb);
678	}	832	}
679		833
680	#############################################################################	834	#############################################################################
681	# the server's main()	835	# the server's main()
682		836
…		…
708	$TICK_WATCHER->at ($NEXT_TICK);	862	$TICK_WATCHER->at ($NEXT_TICK);
709	$TICK_WATCHER->start;	863	$TICK_WATCHER->start;
710	},	864	},
711	);	865	);
712		866
		867	_reload_2;
		868
713	1	869	1
714		870

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.40 by root, Fri Aug 25 15:21:57 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.40 by root, Fri Aug 25 15:21:57 2006 UTC vs.
Revision 1.47 by root, Sun Aug 27 13:02:04 2006 UTC