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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.35 by root, Thu Aug 24 13:35:48 2006 UTC vs.
Revision 1.45 by root, Sat Aug 26 23:36:32 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 %PROP_TYPE;	18	our %PROP_TYPE;
19	our %PROP_IDX;	19	our %PROP_IDX;
20	our $LIBDIR = maps_directory "perl";	20	our $LIBDIR = maps_directory "perl";
21		21
22	our $TICK = MAX_TIME * 1e-6;	22	our $TICK = MAX_TIME * 1e-6;
23	our $TICK_WATCHER;	23	our $TICK_WATCHER;
24	our $NEXT_TICK;	24	our $NEXT_TICK;
25		25
26	BEGIN {	26	BEGIN {
27	@EVENT = map lc, @EVENT;
28
29	*CORE::GLOBAL::warn = sub {	27	*CORE::GLOBAL::warn = sub {
30	my $msg = join "", @_;	28	my $msg = join "", @_;
31	$msg .= "\n"	29	$msg .= "\n"
32	unless $msg =~ /\n$/;	30	unless $msg =~ /\n$/;
33		31
…		…
68	prop_gen PLAYER_PROP => "cf::object::player";	66	prop_gen PLAYER_PROP => "cf::object::player";
69		67
70	prop_gen MAP_PROP => "cf::map";	68	prop_gen MAP_PROP => "cf::map";
71	prop_gen ARCH_PROP => "cf::arch";	69	prop_gen ARCH_PROP => "cf::arch";
72		70
73	# guessed hierarchies
74
75	@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	71	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
76	@ext::cf::object::map::ISA = @cf::object::map::ISA = 'cf::object';
77		72
78	# 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
79	# within the Safe compartment.	74	# 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)) {	75	for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
81	no strict 'refs';	76	no strict 'refs';
82	@{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	77	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
83	}	78	}
84		79
85	$Event::DIED = sub {	80	$Event::DIED = sub {
86	warn "error in event callback: @_";	81	warn "error in event callback: @_";
87	};	82	};
…		…
90	my @exts;	85	my @exts;
91	my @hook;	86	my @hook;
92	my %command;	87	my %command;
93	my %extcmd;	88	my %extcmd;
94		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 cf::object::attach ... # NYI
		109
		110	=item cf::attach_global ...
		111
		112	=item cf::attach_to_type $object_type, ...
		113
		114	=item cf::attach_to_objects ...
		115
		116	=item cf::attach_to_players ...
		117
		118	=item cf::attach_to_maps ...
		119
		120	=item cf:register_attachment $name, ...
		121
		122	prio => $number, # lower is earlier
		123	on_xxx => \&cb,
		124	package => package::,
		125
		126	=cut
		127
		128	# the following variables are defined in .xs and must not be re-created
		129	our @CB_GLOBAL = (); # registry for all global events
		130	our @CB_OBJECT = (); # all objects (should not be used except in emergency)
		131	our @CB_PLAYER = ();
		132	our @CB_TYPE = (); # registry for type (cf-object class) based events
		133	our @CB_MAP = ();
		134
		135	my %attachment;
		136
		137	sub _attach_cb($\%$$$) {
		138	my ($registry, $undo, $event, $prio, $cb) = @_;
		139
		140	use sort 'stable';
		141
		142	$cb = [$prio, $cb];
		143
		144	@{$registry->[$event]} = sort
		145	{ $a->[0] cmp $b->[0] }
		146	@{$registry->[$event] \|\| []}, $cb;
		147
		148	push @{$undo->{cb}}, [$event, $cb];
		149	}
		150
		151	# attach handles attaching event callbacks
		152	# the only thing the caller has to do is pass the correct
		153	# registry (== where the callback attaches to).
		154	sub _attach(\@$@) {
		155	my ($registry, $klass, @arg) = @_;
		156
		157	my $prio = 0;
		158
		159	my %undo = (
		160	registry => $registry,
		161	cb => [],
		162	);
		163
		164	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
		165
		166	while (@arg) {
		167	my $type = shift @arg;
		168
		169	if ($type eq "prio") {
		170	$prio = shift @arg;
		171
		172	} elsif ($type eq "package") {
		173	my $pkg = shift @arg;
		174
		175	while (my ($name, $id) = each %cb_id) {
		176	if (my $cb = $pkg->can ($name)) {
		177	_attach_cb $registry, %undo, $id, $prio, $cb;
		178	}
		179	}
		180
		181	} elsif (exists $cb_id{$type}) {
		182	_attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
		183
		184	} elsif (ref $type) {
		185	warn "attaching objects not supported, ignoring.\n";
		186
		187	} else {
		188	shift @arg;
		189	warn "attach argument '$type' not supported, ignoring.\n";
		190	}
		191	}
		192
		193	\%undo
		194	}
		195
		196	sub cf::object::attach {
		197	die;
		198	}
		199
		200	sub attach_global {
		201	_attach @CB_GLOBAL, KLASS_GLOBAL, @_
		202	}
		203
		204	sub attach_to_type {
		205	my $type = shift;
		206
		207	_attach @{$CB_TYPE[$type]}, KLASS_OBJECT, @_
		208	}
		209
		210	sub attach_to_objects {
		211	_attach @CB_OBJECT, KLASS_OBJECT, @_
		212	}
		213
		214	sub attach_to_players {
		215	_attach @CB_PLAYER, KLASS_PLAYER, @_
		216	}
		217
		218	sub attach_to_maps {
		219	_attach @CB_MAP, KLASS_MAP, @_
		220	}
		221
		222	sub register_attachment {
		223	my $name = shift;
		224
		225	$attachment{$name} = [@_];
		226	}
		227
		228	our $override;
		229	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
		230
		231	sub override {
		232	$override = 1;
		233	@invoke_results = ();
		234	}
		235
		236	sub do_invoke {
		237	my $event = shift;
		238	my $callbacks = shift;
		239
		240	@invoke_results = ();
		241
		242	local $override;
		243
		244	for (@$callbacks) {
		245	eval { &{$_->[1]} };
		246
		247	if ($@) {
		248	warn "$@";
		249	warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";
		250	override;
		251	}
		252
		253	return 1 if $override;
		254	}
		255
		256	0
		257	}
		258
		259	#############################################################################
		260	# object support
		261
		262	sub instantiate {
		263	my ($obj, $data) = @_;
		264	my $registry = $obj->registry;
		265
		266	$data = from_json $data;
		267
		268	for (@$data) {
		269	my ($pri, $name, @args) = @$_;
		270
		271	if (my $attach = $attachment{$name}) {
		272	_attach @$registry, KLASS_OBJECT, @$attach;
		273
		274	if (my $cb = delete $registry->[EVENT_OBJECT_INSTANTIATE]) {
		275	for (@$cb) {
		276	eval { $_->[1]->($obj, @args); };
		277	if ($@) {
		278	warn "$@";
		279	warn "... while processing '$name' instantiate with args <@args>\n";
		280	}
		281	}
		282	}
		283	} else {
		284	warn "object uses attachment $name that is not available, postponing.\n";
		285	}
		286
		287	push @{$obj->{_attachment}}, $name;
		288	}
		289	}
		290
		291	# basically do the same as instantiate, without calling instantiate
		292	sub reattach {
		293	my ($obj) = @_;
		294	my $registry = $obj->registry;
		295
		296	warn "reattach<@_, $_>\n";
		297	}
		298
		299	attach_to_objects
		300	prio => -1000000,
		301	on_clone => sub {
		302	my ($src, $dst) = @_;
		303
		304	@{$dst->registry} = @{$src->registry};
		305	warn "registry clone ", join ":", @{$src->registry};#d#
		306
		307	%$dst = %$src;
		308
		309	$dst->{_attachment} = [@{ $src->{_attachment} }]
		310	if exists $src->{_attachment};
		311
		312	warn "clone<@_>\n";#d#
		313	},
		314	;
		315
		316	#############################################################################
		317	# old plug-in events
		318
95	sub inject_event {	319	sub inject_event {
96	my $extension = shift;	320	my $extension = shift;
97	my $event_code = shift;	321	my $event_code = shift;
98		322
99	my $cb = $hook[$event_code]{$extension}	323	my $cb = $hook[$event_code]{$extension}
…		…
141	}	365	}
142		366
143	sub register {	367	sub register {
144	my ($base, $pkg) = @_;	368	my ($base, $pkg) = @_;
145		369
146	for my $idx (0 .. $#EVENT) {	370	#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	}	371	}
153		372
154	sub load_extension {	373	sub load_extension {
155	my ($path) = @_;	374	my ($path) = @_;
156		375
157	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	376	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
158	my $base = $1;	377	my $base = $1;
159	my $pkg = $1;	378	my $pkg = $1;
160	$pkg =~ s/[^[:word:]]/_/g;	379	$pkg =~ s/[^[:word:]]/_/g;
161	$pkg = "cf::ext::$pkg";	380	$pkg = "ext::$pkg";
162		381
163	warn "loading '$path' into '$pkg'\n";	382	warn "loading '$path' into '$pkg'\n";
164		383
165	open my $fh, "<:utf8", $path	384	open my $fh, "<:utf8", $path
166	or die "$path: $!";	385	or die "$path: $!";
…		…
187	my ($pkg) = @_;	406	my ($pkg) = @_;
188		407
189	warn "removing extension $pkg\n";	408	warn "removing extension $pkg\n";
190		409
191	# remove hooks	410	# remove hooks
		411	#TODO
192	for my $idx (0 .. $#EVENT) {	412	# for my $idx (0 .. $#PLUGIN_EVENT) {
193	delete $hook[$idx]{$pkg};	413	# delete $hook[$idx]{$pkg};
194	}	414	# }
195		415
196	# remove commands	416	# remove commands
197	for my $name (keys %command) {	417	for my $name (keys %command) {
198	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };	418	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
199		419
…		…
209	# remove extcmds	429	# remove extcmds
210	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {	430	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
211	delete $extcmd{$name};	431	delete $extcmd{$name};
212	}	432	}
213		433
214	if (my $cb = $pkg->can ("on_unload")) {	434	if (my $cb = $pkg->can ("unload")) {
215	eval {	435	eval {
216	$cb->($pkg);	436	$cb->($pkg);
217	1	437	1
218	} or warn "$pkg unloaded, but with errors: $@";	438	} or warn "$pkg unloaded, but with errors: $@";
219	}	439	}
…		…
231	1	451	1
232	} or warn "$ext not loaded: $@";	452	} or warn "$ext not loaded: $@";
233	}	453	}
234	}	454	}
235		455
		456	sub _perl_reload(&) {
		457	my ($msg) = @_;
		458
		459	$msg->("reloading...");
		460
		461	eval {
		462	# 1. cancel all watchers
		463	$_->cancel for Event::all_watchers;
		464
		465	# 2. unload all extensions
		466	for (@exts) {
		467	$msg->("unloading <$_>");
		468	unload_extension $_;
		469	}
		470
		471	# 3. unload all modules loaded from $LIBDIR
		472	while (my ($k, $v) = each %INC) {
		473	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		474
		475	$msg->("removing <$k>");
		476	delete $INC{$k};
		477
		478	$k =~ s/\.pm$//;
		479	$k =~ s/\//::/g;
		480
		481	if (my $cb = $k->can ("unload_module")) {
		482	$cb->();
		483	}
		484
		485	Symbol::delete_package $k;
		486	}
		487
		488	# 4. get rid of safe::, as good as possible
		489	Symbol::delete_package "safe::$_"
		490	for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
		491
		492	# 5. remove register_script_function callbacks
		493	# TODO
		494
		495	# 6. unload cf.pm "a bit"
		496	delete $INC{"cf.pm"};
		497
		498	# don't, removes xs symbols, too,
		499	# and global variables created in xs
		500	#Symbol::delete_package __PACKAGE__;
		501
		502	# 7. reload cf.pm
		503	$msg->("reloading cf.pm");
		504	require cf;
		505	};
		506	$msg->($@) if $@;
		507
		508	$msg->("reloaded");
		509	};
		510
		511	sub perl_reload() {
		512	_perl_reload {
		513	warn $_[0];
		514	print "$_[0]\n";
		515	};
		516	}
		517
236	register_command "perl-reload", 0, sub {	518	register_command "perl-reload", 0, sub {
237	my ($who, $arg) = @_;	519	my ($who, $arg) = @_;
238		520
239	if ($who->flag (FLAG_WIZ)) {	521	if ($who->flag (FLAG_WIZ)) {
240	$who->message ("reloading...");	522	_perl_reload {
241		523	warn $_[0];
242	warn "reloading...\n";	524	$who->message ($_[0]);
243	eval {
244	# 1. cancel all watchers
245	$_->cancel for Event::all_watchers;
246
247	# 2. unload all extensions
248	for (@exts) {
249	$who->message ("unloading <$_>");
250	unload_extension $_;
251	}
252
253	# 3. unload all modules loaded from $LIBDIR
254	while (my ($k, $v) = each %INC) {
255	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
256
257	$who->message ("removing <$k>");
258	delete $INC{$k};
259
260	$k =~ s/\.pm$//;
261	$k =~ s/\//::/g;
262
263	if (my $cb = $k->can ("unload_module")) {
264	$cb->();
265	}
266
267	Symbol::delete_package $k;
268	}
269
270	# 4. get rid of ext::, as good as possible
271	Symbol::delete_package "ext::$_"
272	for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
273
274	# 5. remove register_script_function callbacks
275	# TODO
276
277	# 6. unload cf.pm "a bit"
278	delete $INC{"cf.pm"};
279
280	# don't, removes xs symbols, too
281	#Symbol::delete_package __PACKAGE__;
282
283	# 7. reload cf.pm
284	$who->message ("reloading cf.pm");
285	require cf;
286	};	525	};
287	warn $@ if $@;
288	$who->message ($@) if $@;
289	warn "reloaded\n";
290
291	$who->message ("reloaded");
292	} else {
293	$who->message ("Intruder Alert!");
294	}	526	}
295	};	527	};
296
297	#############################################################################
298	# utility functions
299
300	use JSON::Syck (); # TODO# replace by JSON::PC once working
301
302	sub from_json($) {
303	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
304	JSON::Syck::Load $_[0]
305	}
306
307	sub to_json($) {
308	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
309	JSON::Syck::Dump $_[0]
310	}
311		528
312	#############################################################################	529	#############################################################################
313	# extcmd framework, basically convert ext <msg>	530	# extcmd framework, basically convert ext <msg>
314	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few	531	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
315		532
316	sub on_extcmd {	533	attach_to_players
		534	on_extcmd => sub {
317	my ($pl, $buf) = @_;	535	my ($pl, $buf) = @_;
318		536
319	my $msg = eval { from_json $buf };	537	my $msg = eval { from_json $buf };
320		538
321	if (ref $msg) {	539	if (ref $msg) {
322	if (my $cb = $extcmd{$msg->{msgtype}}) {	540	if (my $cb = $extcmd{$msg->{msgtype}}) {
323	if (my %reply = $cb->[0]->($pl, $msg)) {	541	if (my %reply = $cb->[0]->($pl, $msg)) {
324	$pl->ext_reply ($msg->{msgid}, %reply);	542	$pl->ext_reply ($msg->{msgid}, %reply);
		543	}
325	}	544	}
		545	} else {
		546	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
326	}	547	}
327	} else {	548
328	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	549	cf::override;
329	}	550	},
330		551	;
331	1
332	}
333		552
334	#############################################################################	553	#############################################################################
335	# load/save/clean perl data associated with a map	554	# load/save/clean perl data associated with a map
336		555
337	*on_mapclean = sub {	556	*cf::mapsupport::on_clean = sub {
338	my ($map) = @_;	557	my ($map) = @_;
339		558
340	my $path = $map->tmpname;	559	my $path = $map->tmpname;
341	defined $path or return;	560	defined $path or return;
342		561
343	unlink "$path.cfperl";	562	unlink "$path.cfperl";
344	};	563	};
345		564
346	*on_mapin =	565	*cf::mapsupport::on_swapin =
347	*on_mapload = sub {	566	*cf::mapsupport::on_load = sub {
348	my ($map) = @_;	567	my ($map) = @_;
349		568
350	my $path = $map->tmpname;	569	my $path = $map->tmpname;
351	$path = $map->path unless defined $path;	570	$path = $map->path unless defined $path;
352		571
…		…
359	or return; # too new	578	or return; # too new
360		579
361	$map->_set_obs ($data->{obs});	580	$map->_set_obs ($data->{obs});
362	};	581	};
363		582
364	*on_mapout = sub {	583	*cf::mapsupport::on_swapout = sub {
365	my ($map) = @_;	584	my ($map) = @_;
366		585
367	my $path = $map->tmpname;	586	my $path = $map->tmpname;
368	$path = $map->path unless defined $path;	587	$path = $map->path unless defined $path;
369		588
…		…
386	} else {	605	} else {
387	unlink "$path.cfperl";	606	unlink "$path.cfperl";
388	}	607	}
389	};	608	};
390		609
		610	attach_to_maps prio => -10000, package => cf::mapsupport::;
		611
391	#############################################################################	612	#############################################################################
392	# load/save perl data associated with player->ob objects	613	# load/save perl data associated with player->ob objects
393		614
394	sub all_objects(@) {	615	sub all_objects(@) {
395	@_, map all_objects ($_->inv), @_	616	@_, map all_objects ($_->inv), @_
396	}	617	}
397		618
398	*on_player_load = sub {	619	attach_to_players
		620	on_load => sub {
399	my ($ob, $path) = @_;	621	my ($pl, $path) = @_;
400		622
401	for my $o (all_objects $ob) {	623	for my $o (all_objects $pl->ob) {
402	if (my $value = $o->get_ob_key_value ("_perl_data")) {	624	if (my $value = $o->get_ob_key_value ("_perl_data")) {
403	$o->set_ob_key_value ("_perl_data");	625	$o->set_ob_key_value ("_perl_data");
404		626
405	%$o = %{ Storable::thaw pack "H*", $value };	627	%$o = %{ Storable::thaw pack "H*", $value };
		628	}
406	}	629	}
407	}	630	},
408	};	631	on_save => sub {
409
410	*on_player_save = sub {
411	my ($ob, $path) = @_;	632	my ($pl, $path) = @_;
412		633
413	$_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)	634	$_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
414	for grep %$_, all_objects $ob;	635	for grep %$_, all_objects $pl->ob;
415	};	636	},
		637	;
416		638
417	#############################################################################	639	#############################################################################
418	# core extensions - in perl	640	# core extensions - in perl
419		641
420	=item cf::player::exists $login	642	=item cf::player::exists $login
…		…
466	}	688	}
467		689
468	#############################################################################	690	#############################################################################
469	# map scripting support	691	# map scripting support
470		692
471	our $safe = new Safe "ext";	693	our $safe = new Safe "safe";
472	our $safe_hole = new Safe::Hole;	694	our $safe_hole = new Safe::Hole;
473		695
474	$SIG{FPE} = 'IGNORE';	696	$SIG{FPE} = 'IGNORE';
475		697
476	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	698	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
…		…
482	["cf::object::player" => qw(player)],	704	["cf::object::player" => qw(player)],
483	["cf::player" => qw(peaceful)],	705	["cf::player" => qw(peaceful)],
484	) {	706	) {
485	no strict 'refs';	707	no strict 'refs';
486	my ($pkg, @funs) = @$_;	708	my ($pkg, @funs) = @$_;
487	*{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	709	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
488	for @funs;	710	for @funs;
489	}	711	}
490		712
491	sub safe_eval($;@) {	713	sub safe_eval($;@) {
492	my ($code, %vars) = @_;	714	my ($code, %vars) = @_;
…		…
494	my $qcode = $code;	716	my $qcode = $code;
495	$qcode =~ s/"/‟/g; # not allowed in #line filenames	717	$qcode =~ s/"/‟/g; # not allowed in #line filenames
496	$qcode =~ s/\n/\\n/g;	718	$qcode =~ s/\n/\\n/g;
497		719
498	local $_;	720	local $_;
499	local @ext::cf::_safe_eval_args = values %vars;	721	local @safe::cf::_safe_eval_args = values %vars;
500		722
501	$code =	723	my $eval =
502	"do {\n"	724	"do {\n"
503	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	725	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
504	. "#line 0 \"{$qcode}\"\n"	726	. "#line 0 \"{$qcode}\"\n"
505	. $code	727	. $code
506	. "\n}"	728	. "\n}"
507	;	729	;
508		730
509	sub_generation_inc;	731	sub_generation_inc;
510	my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code);	732	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
511	sub_generation_inc;	733	sub_generation_inc;
		734
		735	if ($@) {
		736	warn "$@";
		737	warn "while executing safe code '$code'\n";
		738	warn "with arguments " . (join " ", %vars) . "\n";
		739	}
512		740
513	wantarray ? @res : $res[0]	741	wantarray ? @res : $res[0]
514	}	742	}
515		743
516	sub register_script_function {	744	sub register_script_function {
517	my ($fun, $cb) = @_;	745	my ($fun, $cb) = @_;
518		746
519	no strict 'refs';	747	no strict 'refs';
520	*{"ext::$fun"} = $safe_hole->wrap ($cb);	748	*{"safe::$fun"} = $safe_hole->wrap ($cb);
521	}	749	}
522		750
523	#############################################################################	751	#############################################################################
524	# the server's main()	752	# the server's main()
525		753
526	sub run {	754	sub main {
527	Event::loop;	755	Event::loop;
528	}	756	}
529		757
530	#############################################################################	758	#############################################################################
531	# initialisation	759	# initialisation
…		…
543	cf::server_tick; # one server iteration	771	cf::server_tick; # one server iteration
544		772
545	my $NOW = Event::time;	773	my $NOW = Event::time;
546	$NEXT_TICK += $TICK;	774	$NEXT_TICK += $TICK;
547		775
548	# if we are delayed by > 0.25 second, skip ticks	776	# if we are delayed by four ticks, skip them all
549	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + .25;	777	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
550		778
551	$TICK_WATCHER->at ($NEXT_TICK);	779	$TICK_WATCHER->at ($NEXT_TICK);
552	$TICK_WATCHER->start;	780	$TICK_WATCHER->start;
553	},	781	},
554	);	782	);

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.35 by root, Thu Aug 24 13:35:48 2006 UTC vs. Revision 1.45 by root, Sat Aug 26 23:36:32 2006 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.35 by root, Thu Aug 24 13:35:48 2006 UTC vs.
Revision 1.45 by root, Sat Aug 26 23:36:32 2006 UTC