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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.54 by root, Tue Aug 29 14:49:28 2006 UTC vs.
Revision 1.93 by root, Thu Dec 21 22:41:35 2006 UTC

…		…
5	use Storable;	5	use Storable;
6	use Opcode;	6	use Opcode;
7	use Safe;	7	use Safe;
8	use Safe::Hole;	8	use Safe::Hole;
9		9
		10	use IO::AIO ();
		11	use YAML::Syck ();
10	use Time::HiRes;	12	use Time::HiRes;
11	use Event;	13	use Event;
12	$Event::Eval = 1; # no idea why this is required, but it is	14	$Event::Eval = 1; # no idea why this is required, but it is
13		15
		16	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
		17	$YAML::Syck::ImplicitUnicode = 1;
		18
14	use strict;	19	use strict;
15		20
16	_reload_1;	21	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
17		22
18	our %COMMAND = ();	23	our %COMMAND = ();
		24	our %COMMAND_TIME = ();
		25	our %EXTCMD = ();
		26
		27	_init_vars;
		28
19	our @EVENT;	29	our @EVENT;
20	our %PROP_TYPE;	30	our $LIBDIR = datadir . "/ext";
21	our %PROP_IDX;
22	our $LIBDIR = maps_directory "perl";
23		31
24	our $TICK = MAX_TIME * 1e-6;	32	our $TICK = MAX_TIME * 1e-6;
25	our $TICK_WATCHER;	33	our $TICK_WATCHER;
26	our $NEXT_TICK;	34	our $NEXT_TICK;
		35
		36	our %CFG;
		37
		38	our $UPTIME; $UPTIME \|\|= time;
		39
		40	#############################################################################
		41
		42	=head2 GLOBAL VARIABLES
		43
		44	=over 4
		45
		46	=item $cf::UPTIME
		47
		48	The timestamp of the server start (so not actually an uptime).
		49
		50	=item $cf::LIBDIR
		51
		52	The perl library directory, where extensions and cf-specific modules can
		53	be found. It will be added to C<@INC> automatically.
		54
		55	=item $cf::TICK
		56
		57	The interval between server ticks, in seconds.
		58
		59	=item %cf::CFG
		60
		61	Configuration for the server, loaded from C</etc/crossfire/config>, or
		62	from wherever your confdir points to.
		63
		64	=back
		65
		66	=cut
27		67
28	BEGIN {	68	BEGIN {
29	*CORE::GLOBAL::warn = sub {	69	*CORE::GLOBAL::warn = sub {
30	my $msg = join "", @_;	70	my $msg = join "", @_;
31	$msg .= "\n"	71	$msg .= "\n"
…		…
34	print STDERR "cfperl: $msg";	74	print STDERR "cfperl: $msg";
35	LOG llevError, "cfperl: $msg";	75	LOG llevError, "cfperl: $msg";
36	};	76	};
37	}	77	}
38		78
39	my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply!	79	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
40		80	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
41	# generate property mutators	81	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
42	sub prop_gen {	82	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
43	my ($prefix, $class) = @_;	83	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
44
45	no strict 'refs';
46
47	for my $prop (keys %PROP_TYPE) {
48	$prop =~ /^\Q$prefix\E_(.*$)/ or next;
49	my $sub = lc $1;
50
51	my $type = $PROP_TYPE{$prop};
52	my $idx = $PROP_IDX {$prop};
53
54	{"$class\::get_$sub"} = {"$class\::$sub"} = sub {
55	$_[0]->get_property ($type, $idx)
56	};
57
58	*{"$class\::set_$sub"} = sub {
59	$_[0]->set_property ($type, $idx, $_[1]);
60	} unless $ignore_set{$prop};
61	}
62	}
63
64	# auto-generate most of the API
65
66	prop_gen OBJECT_PROP => "cf::object";
67	# CFAPI_OBJECT_ANIMATION?
68	prop_gen PLAYER_PROP => "cf::object::player";
69
70	prop_gen MAP_PROP => "cf::map";
71	prop_gen ARCH_PROP => "cf::arch";
72
73	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	84	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
74		85
75	# we bless all objects into (empty) derived classes to force a method lookup	86	# we bless all objects into (empty) derived classes to force a method lookup
76	# within the Safe compartment.	87	# within the Safe compartment.
77	for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) {	88	for my $pkg (qw(
		89	cf::global
		90	cf::object cf::object::player
		91	cf::client cf::player
		92	cf::arch cf::living
		93	cf::map cf::party cf::region
		94	)) {
78	no strict 'refs';	95	no strict 'refs';
79	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	96	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
80	}	97	}
81		98
82	$Event::DIED = sub {	99	$Event::DIED = sub {
…		…
84	};	101	};
85		102
86	my %ext_pkg;	103	my %ext_pkg;
87	my @exts;	104	my @exts;
88	my @hook;	105	my @hook;
89	my %command;
90	my %extcmd;
91		106
92	#############################################################################	107	=head2 UTILITY FUNCTIONS
93	# utility functions	108
		109	=over 4
		110
		111	=cut
94		112
95	use JSON::Syck (); # TODO# replace by JSON::PC once working	113	use JSON::Syck (); # TODO# replace by JSON::PC once working
		114
		115	=item $ref = cf::from_json $json
		116
		117	Converts a JSON string into the corresponding perl data structure.
		118
		119	=cut
96		120
97	sub from_json($) {	121	sub from_json($) {
98	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs	122	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
99	JSON::Syck::Load $_[0]	123	JSON::Syck::Load $_[0]
100	}	124	}
101		125
		126	=item $json = cf::to_json $ref
		127
		128	Converts a perl data structure into its JSON representation.
		129
		130	=cut
		131
102	sub to_json($) {	132	sub to_json($) {
103	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	133	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
104	JSON::Syck::Dump $_[0]	134	JSON::Syck::Dump $_[0]
105	}	135	}
106		136
		137	=back
		138
		139	=cut
		140
107	#############################################################################	141	#############################################################################
108	# "new" plug-in system
109		142
110	=item $object->attach ($attachment, key => $value...)	143	=head2 ATTACHABLE OBJECTS
111		144
112	=item $object->detach ($attachment)	145	You can define and attach attachments to each "attachable" object in
		146	crossfire+ (objects, players, clients, maps and the special "global"
		147	class). In the following description, CLASS can be any of C<global>,
		148	C<object> C<player>, C<client> or C<map>.
113		149
114	Attach/detach a pre-registered attachment to an object.	150	=over 4
115		151
116	=item $player->attach ($attachment, key => $value...)	152	=item cf::CLASS::attachment $name, ...
117		153
118	=item $player->detach ($attachment)	154	Register an attachment by name through which attachable objects can refer
		155	to this attachment.
119		156
120	Attach/detach a pre-registered attachment to a player.	157	=item $bool = $attachable->attached ($name)
121		158
		159	Checks wether the named attachment is currently attached to the object.
		160
122	=item $map->attach ($attachment, key => $value...)	161	=item $attachable->attach ($attachment, key => $value...)
123		162
124	=item $map->detach ($attachment)	163	=item $attachable->detach ($attachment)
125		164
126	Attach/detach a pre-registered attachment to a map.	165	Attach/detach a pre-registered attachment either to a specific object
		166	(C<$attachable>) or all objects of the given class (if C<$attachable> is a
		167	class in a static method call).
127		168
128	=item cf::attach_global ...	169	You can attach to global events by using the C<cf::global> class.
129		170
130	Attach handlers for global events.	171	These method calls expect any number of the following handler/hook
131		172	descriptions:
132	This and all following C<attach_*>-functions expect any number of the
133	following handler/hook descriptions:
134		173
135	=over 4	174	=over 4
136		175
137	=item prio => $number	176	=item prio => $number
138		177
…		…
140	by another C<prio> setting). Lower priority handlers get executed	179	by another C<prio> setting). Lower priority handlers get executed
141	earlier. The default priority is C<0>, and many built-in handlers are	180	earlier. The default priority is C<0>, and many built-in handlers are
142	registered at priority C<-1000>, so lower priorities should not be used	181	registered at priority C<-1000>, so lower priorities should not be used
143	unless you know what you are doing.	182	unless you know what you are doing.
144		183
		184	=item type => $type
		185
		186	(Only for C<< cf::object->attach >> calls), limits the attachment to the
		187	given type of objects only (the additional parameter C<subtype> can be
		188	used to further limit to the given subtype).
		189
145	=item on_I<event> => \&cb	190	=item on_I<event> => \&cb
146		191
147	Call the given code reference whenever the named event happens (event is	192	Call the given code reference whenever the named event happens (event is
148	something like C<instantiate>, C<apply>, C<use_skill> and so on, and which	193	something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
149	handlers are recognised generally depends on the type of object these	194	handlers are recognised generally depends on the type of object these
…		…
158	package and register them. Only handlers for eevents supported by the	203	package and register them. Only handlers for eevents supported by the
159	object/class are recognised.	204	object/class are recognised.
160		205
161	=back	206	=back
162		207
163	=item cf::attach_to_type $object_type, $subtype, ...
164
165	Attach handlers for a specific object type (e.g. TRANSPORT) and
166	subtype. If C<$subtype> is zero or undef, matches all objects of the given
167	type.
168
169	=item cf::attach_to_objects ...
170
171	Attach handlers to all objects. Do not use this except for debugging or
172	very rare events, as handlers are (obviously) called for I<all> objects in
173	the game.
174
175	=item cf::attach_to_players ...
176
177	Attach handlers to all players.
178
179	=item cf::attach_to_maps ...
180
181	Attach handlers to all maps.
182
183	=item cf:register_attachment $name, ...
184
185	Register an attachment by name through which objects can refer to this
186	attachment.
187
188	=item cf:register_map_attachment $name, ...
189
190	Register an attachment by name through which maps can refer to this
191	attachment.
192
193	=cut	208	=cut
194		209
195	# the following variables are defined in .xs and must not be re-created	210	# the following variables are defined in .xs and must not be re-created
196	our @CB_GLOBAL = (); # registry for all global events	211	our @CB_GLOBAL = (); # registry for all global events
197	our @CB_OBJECT = (); # all objects (should not be used except in emergency)	212	our @CB_OBJECT = (); # all objects (should not be used except in emergency)
198	our @CB_PLAYER = ();	213	our @CB_PLAYER = ();
		214	our @CB_CLIENT = ();
199	our @CB_TYPE = (); # registry for type (cf-object class) based events	215	our @CB_TYPE = (); # registry for type (cf-object class) based events
200	our @CB_MAP = ();	216	our @CB_MAP = ();
201		217
202	my %attachment;	218	my %attachment;
203		219
204	sub _attach_cb($\%$$$) {	220	sub _attach_cb($$$$) {
205	my ($registry, $undo, $event, $prio, $cb) = @_;	221	my ($registry, $event, $prio, $cb) = @_;
206		222
207	use sort 'stable';	223	use sort 'stable';
208		224
209	$cb = [$prio, $cb];	225	$cb = [$prio, $cb];
210		226
211	@{$registry->[$event]} = sort	227	@{$registry->[$event]} = sort
212	{ $a->[0] cmp $b->[0] }	228	{ $a->[0] cmp $b->[0] }
213	@{$registry->[$event] \|\| []}, $cb;	229	@{$registry->[$event] \|\| []}, $cb;
214
215	push @{$undo->{cb}}, [$event, $cb];
216	}	230	}
217		231
218	# attach handles attaching event callbacks	232	# attach handles attaching event callbacks
219	# the only thing the caller has to do is pass the correct	233	# the only thing the caller has to do is pass the correct
220	# registry (== where the callback attaches to).	234	# registry (== where the callback attaches to).
221	sub _attach(\@$@) {	235	sub _attach {
222	my ($registry, $klass, @arg) = @_;	236	my ($registry, $klass, @arg) = @_;
223		237
		238	my $object_type;
224	my $prio = 0;	239	my $prio = 0;
225
226	my %undo = (
227	registry => $registry,
228	cb => [],
229	);
230
231	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;	240	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
232		241
233	while (@arg) {	242	while (@arg) {
234	my $type = shift @arg;	243	my $type = shift @arg;
235		244
236	if ($type eq "prio") {	245	if ($type eq "prio") {
237	$prio = shift @arg;	246	$prio = shift @arg;
238		247
		248	} elsif ($type eq "type") {
		249	$object_type = shift @arg;
		250	$registry = $CB_TYPE[$object_type] \|\|= [];
		251
		252	} elsif ($type eq "subtype") {
		253	defined $object_type or Carp::croak "subtype specified without type";
		254	my $object_subtype = shift @arg;
		255	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] \|\|= [];
		256
239	} elsif ($type eq "package") {	257	} elsif ($type eq "package") {
240	my $pkg = shift @arg;	258	my $pkg = shift @arg;
241		259
242	while (my ($name, $id) = each %cb_id) {	260	while (my ($name, $id) = each %cb_id) {
243	if (my $cb = $pkg->can ($name)) {	261	if (my $cb = $pkg->can ($name)) {
244	_attach_cb $registry, %undo, $id, $prio, $cb;	262	_attach_cb $registry, $id, $prio, $cb;
245	}	263	}
246	}	264	}
247		265
248	} elsif (exists $cb_id{$type}) {	266	} elsif (exists $cb_id{$type}) {
249	_attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;	267	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
250		268
251	} elsif (ref $type) {	269	} elsif (ref $type) {
252	warn "attaching objects not supported, ignoring.\n";	270	warn "attaching objects not supported, ignoring.\n";
253		271
254	} else {	272	} else {
255	shift @arg;	273	shift @arg;
256	warn "attach argument '$type' not supported, ignoring.\n";	274	warn "attach argument '$type' not supported, ignoring.\n";
257	}	275	}
258	}	276	}
259
260	\%undo
261	}	277	}
262		278
263	sub _attach_attachment {	279	sub _object_attach {
264	my ($obj, $name, %arg) = @_;	280	my ($obj, $name, %arg) = @_;
265		281
266	my $res;	282	return if exists $obj->{_attachment}{$name};
267		283
268	if (my $attach = $attachment{$name}) {	284	if (my $attach = $attachment{$name}) {
269	my $registry = $obj->registry;	285	my $registry = $obj->registry;
270		286
271	for (@$attach) {	287	for (@$attach) {
272	my ($klass, @attach) = @$_;	288	my ($klass, @attach) = @$_;
273	$res = _attach @$registry, $klass, @attach;	289	_attach $registry, $klass, @attach;
274	}	290	}
275		291
276	$obj->{$name} = \%arg;	292	$obj->{$name} = \%arg;
277	} else {	293	} else {
278	warn "object uses attachment '$name' that is not available, postponing.\n";	294	warn "object uses attachment '$name' that is not available, postponing.\n";
279	}	295	}
280		296
281	$obj->{_attachment}{$name} = undef;	297	$obj->{_attachment}{$name} = undef;
282
283	$res->{attachment} = $name;
284	$res
285	}	298	}
286		299
287	*cf::object::attach =	300	sub cf::attachable::attach {
288	*cf::player::attach =	301	if (ref $_[0]) {
289	*cf::map::attach = sub {	302	_object_attach @_;
290	my ($obj, $name, %arg) = @_;	303	} else {
291		304	_attach shift->_attach_registry, @_;
292	_attach_attachment $obj, $name, %arg;	305	}
293	}	306	};
294		307
295	# all those should be optimised	308	# all those should be optimised
296	*cf::object::detach =	309	sub cf::attachable::detach {
297	*cf::player::detach =
298	*cf::map::detach = sub {
299	my ($obj, $name) = @_;	310	my ($obj, $name) = @_;
300		311
		312	if (ref $obj) {
301	delete $obj->{_attachment}{$name};	313	delete $obj->{_attachment}{$name};
302	reattach $obj;	314	reattach ($obj);
		315	} else {
		316	Carp::croak "cannot, currently, detach class attachments";
		317	}
303	};	318	};
304		319
305	sub attach_global {	320	sub cf::attachable::attached {
306	_attach @CB_GLOBAL, KLASS_GLOBAL, @_	321	my ($obj, $name) = @_;
307	}
308		322
309	sub attach_to_type {	323	exists $obj->{_attachment}{$name}
310	my $type = shift;
311	my $subtype = shift;
312
313	_attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
314	}	324	}
315		325
316	sub attach_to_objects {	326	for my $klass (qw(GLOBAL OBJECT PLAYER CLIENT MAP)) {
317	_attach @CB_OBJECT, KLASS_OBJECT, @_	327	eval "#line " . __LINE__ . " 'cf.pm'
318	}	328	sub cf::\L$klass\E::_attach_registry {
		329	(\\\@CB_$klass, KLASS_$klass)
		330	}
319		331
320	sub attach_to_players {	332	sub cf::\L$klass\E::attachment {
321	_attach @CB_PLAYER, KLASS_PLAYER, @_
322	}
323
324	sub attach_to_maps {
325	_attach @CB_MAP, KLASS_MAP, @_
326	}
327
328	sub register_attachment {
329	my $name = shift;	333	my \$name = shift;
330		334
331	$attachment{$name} = [[KLASS_OBJECT, @_]];
332	}
333
334	sub register_map_attachment {
335	my $name = shift;
336
337	$attachment{$name} = [[KLASS_MAP, @_]];	335	\$attachment{\$name} = [[KLASS_$klass, \@_]];
		336	}
		337	";
		338	die if $@;
338	}	339	}
339		340
340	our $override;	341	our $override;
341	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	342	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
342		343
…		…
356	for (@$callbacks) {	357	for (@$callbacks) {
357	eval { &{$_->[1]} };	358	eval { &{$_->[1]} };
358		359
359	if ($@) {	360	if ($@) {
360	warn "$@";	361	warn "$@";
361	warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n";	362	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
362	override;	363	override;
363	}	364	}
364		365
365	return 1 if $override;	366	return 1 if $override;
366	}	367	}
367		368
368	0	369	0
369	}	370	}
		371
		372	=item $bool = cf::invoke EVENT_GLOBAL_XXX, ...
		373
		374	=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
		375
		376	=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
		377
		378	=item $bool = $client->invoke (EVENT_CLIENT_XXX, ...)
		379
		380	=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
		381
		382	Generate a global/object/player/map-specific event with the given arguments.
		383
		384	This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be
		385	removed in future versions), and there is no public API to access override
		386	results (if you must, access C<@cf::invoke_results> directly).
		387
		388	=back
		389
		390	=cut
		391
		392	#############################################################################
		393
		394	=head2 METHODS VALID FOR ALL ATTACHABLE OBJECTS
		395
		396	Attachable objects includes objects, players, clients and maps.
		397
		398	=over 4
		399
		400	=item $object->valid
		401
		402	Just because you have a perl object does not mean that the corresponding
		403	C-level object still exists. If you try to access an object that has no
		404	valid C counterpart anymore you get an exception at runtime. This method
		405	can be used to test for existence of the C object part without causing an
		406	exception.
		407
		408	=back
		409
		410	=cut
370		411
371	#############################################################################	412	#############################################################################
372	# object support	413	# object support
373		414
374	sub instantiate {	415	sub instantiate {
…		…
394		435
395	for my $name (keys %{ $obj->{_attachment} \|\| {} }) {	436	for my $name (keys %{ $obj->{_attachment} \|\| {} }) {
396	if (my $attach = $attachment{$name}) {	437	if (my $attach = $attachment{$name}) {
397	for (@$attach) {	438	for (@$attach) {
398	my ($klass, @attach) = @$_;	439	my ($klass, @attach) = @$_;
399	_attach @$registry, $klass, @attach;	440	_attach $registry, $klass, @attach;
400	}	441	}
401	} else {	442	} else {
402	warn "object uses attachment '$name' that is not available, postponing.\n";	443	warn "object uses attachment '$name' that is not available, postponing.\n";
403	}	444	}
404	}	445	}
405	}	446	}
406		447
407	sub object_freezer_save {	448	sub object_freezer_save {
408	my ($filename, $objs) = @_;	449	my ($filename, $rdata, $objs) = @_;
409		450
410	if (@$objs) {	451	if (length $$rdata) {
		452	warn sprintf "saving %s (%d,%d)\n",
		453	$filename, length $$rdata, scalar @$objs;
		454
411	open my $fh, ">:raw", "$filename.pst~";	455	if (open my $fh, ">:raw", "$filename~") {
		456	chmod SAVE_MODE, $fh;
		457	syswrite $fh, $$rdata;
		458	close $fh;
		459
		460	if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
		461	chmod SAVE_MODE, $fh;
412	syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };	462	syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
413	close $fh;	463	close $fh;
414	chmod SAVE_MODE, "$filename.pst~";
415	rename "$filename.pst~", "$filename.pst";	464	rename "$filename.pst~", "$filename.pst";
		465	} else {
		466	unlink "$filename.pst";
		467	}
		468
		469	rename "$filename~", $filename;
		470	} else {
		471	warn "FATAL: $filename~: $!\n";
		472	}
416	} else {	473	} else {
		474	unlink $filename;
417	unlink "$filename.pst";	475	unlink "$filename.pst";
418	}	476	}
		477	}
419		478
420	chmod SAVE_MODE, "$filename~";	479	sub object_freezer_as_string {
421	rename "$filename~", $filename;	480	my ($rdata, $objs) = @_;
		481
		482	use Data::Dumper;
		483
		484	$$rdata . Dumper $objs
422	}	485	}
423		486
424	sub object_thawer_load {	487	sub object_thawer_load {
425	my ($filename) = @_;	488	my ($filename) = @_;
426		489
		490	local $/;
		491
		492	my $av;
		493
		494	#TODO: use sysread etc.
		495	if (open my $data, "<:raw:perlio", $filename) {
		496	$data = <$data>;
427	open my $fh, "<:raw:perlio", "$filename.pst"	497	if (open my $pst, "<:raw:perlio", "$filename.pst") {
428	or return;	498	$av = eval { (Storable::thaw <$pst>)->{objs} };
		499	}
		500	return ($data, $av);
		501	}
429		502
430	eval { local $/; (Storable::thaw <$fh>)->{objs} }	503	()
431	}	504	}
432		505
433	attach_to_objects	506	cf::object->attach (
434	prio => -1000000,	507	prio => -1000000,
435	on_clone => sub {	508	on_clone => sub {
436	my ($src, $dst) = @_;	509	my ($src, $dst) = @_;
437		510
438	@{$dst->registry} = @{$src->registry};	511	@{$dst->registry} = @{$src->registry};
…		…
440	%$dst = %$src;	513	%$dst = %$src;
441		514
442	%{$dst->{_attachment}} = %{$src->{_attachment}}	515	%{$dst->{_attachment}} = %{$src->{_attachment}}
443	if exists $src->{_attachment};	516	if exists $src->{_attachment};
444	},	517	},
445	;	518	);
446		519
447	#############################################################################	520	#############################################################################
448	# old plug-in events	521	# command handling &c
449		522
450	sub inject_event {	523	=item cf::register_command $name => \&callback($ob,$args);
451	my $extension = shift;
452	my $event_code = shift;
453		524
454	my $cb = $hook[$event_code]{$extension}	525	Register a callback for execution when the client sends the user command
455	or return;	526	$name.
456		527
457	&$cb	528	=cut
458	}
459
460	sub inject_global_event {
461	my $event = shift;
462
463	my $cb = $hook[$event]
464	or return;
465
466	List::Util::max map &$_, values %$cb
467	}
468
469	sub inject_command {
470	my ($name, $obj, $params) = @_;
471
472	for my $cmd (@{ $command{$name} }) {
473	$cmd->[1]->($obj, $params);
474	}
475
476	-1
477	}
478		529
479	sub register_command {	530	sub register_command {
480	my ($name, $time, $cb) = @_;	531	my ($name, $cb) = @_;
481		532
482	my $caller = caller;	533	my $caller = caller;
483	#warn "registering command '$name/$time' to '$caller'";	534	#warn "registering command '$name/$time' to '$caller'";
484		535
485	push @{ $command{$name} }, [$time, $cb, $caller];	536	push @{ $COMMAND{$name} }, [$caller, $cb];
486	$COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
487	}	537	}
		538
		539	=item cf::register_extcmd $name => \&callback($pl,$packet);
		540
		541	Register a callbackf ro execution when the client sends an extcmd packet.
		542
		543	If the callback returns something, it is sent back as if reply was being
		544	called.
		545
		546	=cut
488		547
489	sub register_extcmd {	548	sub register_extcmd {
490	my ($name, $cb) = @_;	549	my ($name, $cb) = @_;
491		550
492	my $caller = caller;	551	my $caller = caller;
493	#warn "registering extcmd '$name' to '$caller'";	552	#warn "registering extcmd '$name' to '$caller'";
494		553
495	$extcmd{$name} = [$cb, $caller];	554	$EXTCMD{$name} = [$cb, $caller];
496	}	555	}
		556
		557	cf::player->attach (
		558	on_command => sub {
		559	my ($pl, $name, $params) = @_;
		560
		561	my $cb = $COMMAND{$name}
		562	or return;
		563
		564	for my $cmd (@$cb) {
		565	$cmd->[1]->($pl->ob, $params);
		566	}
		567
		568	cf::override;
		569	},
		570	on_extcmd => sub {
		571	my ($pl, $buf) = @_;
		572
		573	my $msg = eval { from_json $buf };
		574
		575	if (ref $msg) {
		576	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
		577	if (my %reply = $cb->[0]->($pl, $msg)) {
		578	$pl->ext_reply ($msg->{msgid}, %reply);
		579	}
		580	}
		581	} else {
		582	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
		583	}
		584
		585	cf::override;
		586	},
		587	);
497		588
498	sub register {	589	sub register {
499	my ($base, $pkg) = @_;	590	my ($base, $pkg) = @_;
500		591
501	#TODO	592	#TODO
…		…
520	. "#line 1 \"$path\"\n{\n"	611	. "#line 1 \"$path\"\n{\n"
521	. (do { local $/; <$fh> })	612	. (do { local $/; <$fh> })
522	. "\n};\n1";	613	. "\n};\n1";
523		614
524	eval $source	615	eval $source
525	or die "$path: $@";	616	or die $@ ? "$path: $@\n"
		617	: "extension disabled.\n";
526		618
527	push @exts, $pkg;	619	push @exts, $pkg;
528	$ext_pkg{$base} = $pkg;	620	$ext_pkg{$base} = $pkg;
529		621
530	# no strict 'refs';	622	# no strict 'refs';
…		…
543	# for my $idx (0 .. $#PLUGIN_EVENT) {	635	# for my $idx (0 .. $#PLUGIN_EVENT) {
544	# delete $hook[$idx]{$pkg};	636	# delete $hook[$idx]{$pkg};
545	# }	637	# }
546		638
547	# remove commands	639	# remove commands
548	for my $name (keys %command) {	640	for my $name (keys %COMMAND) {
549	my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };	641	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
550		642
551	if (@cb) {	643	if (@cb) {
552	$command{$name} = \@cb;	644	$COMMAND{$name} = \@cb;
553	$COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
554	} else {	645	} else {
555	delete $command{$name};
556	delete $COMMAND{"$name\000"};	646	delete $COMMAND{$name};
557	}	647	}
558	}	648	}
559		649
560	# remove extcmds	650	# remove extcmds
561	for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {	651	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
562	delete $extcmd{$name};	652	delete $EXTCMD{$name};
563	}	653	}
564		654
565	if (my $cb = $pkg->can ("unload")) {	655	if (my $cb = $pkg->can ("unload")) {
566	eval {	656	eval {
567	$cb->($pkg);	657	$cb->($pkg);
…		…
571		661
572	Symbol::delete_package $pkg;	662	Symbol::delete_package $pkg;
573	}	663	}
574		664
575	sub load_extensions {	665	sub load_extensions {
576	my $LIBDIR = maps_directory "perl";
577
578	for my $ext (<$LIBDIR/*.ext>) {	666	for my $ext (<$LIBDIR/*.ext>) {
579	next unless -r $ext;	667	next unless -r $ext;
580	eval {	668	eval {
581	load_extension $ext;	669	load_extension $ext;
582	1	670	1
583	} or warn "$ext not loaded: $@";	671	} or warn "$ext not loaded: $@";
584	}	672	}
585	}	673	}
586		674
587	sub _perl_reload(&) {
588	my ($msg) = @_;
589
590	$msg->("reloading...");
591
592	eval {
593	# 1. cancel all watchers
594	$_->cancel for Event::all_watchers;
595
596	# 2. unload all extensions
597	for (@exts) {
598	$msg->("unloading <$_>");
599	unload_extension $_;
600	}
601
602	# 3. unload all modules loaded from $LIBDIR
603	while (my ($k, $v) = each %INC) {
604	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
605
606	$msg->("removing <$k>");
607	delete $INC{$k};
608
609	$k =~ s/\.pm$//;
610	$k =~ s/\//::/g;
611
612	if (my $cb = $k->can ("unload_module")) {
613	$cb->();
614	}
615
616	Symbol::delete_package $k;
617	}
618
619	# 4. get rid of safe::, as good as possible
620	Symbol::delete_package "safe::$_"
621	for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
622
623	# 5. remove register_script_function callbacks
624	# TODO
625
626	# 6. unload cf.pm "a bit"
627	delete $INC{"cf.pm"};
628
629	# don't, removes xs symbols, too,
630	# and global variables created in xs
631	#Symbol::delete_package __PACKAGE__;
632
633	# 7. reload cf.pm
634	$msg->("reloading cf.pm");
635	require cf;
636	};
637	$msg->($@) if $@;
638
639	$msg->("reloaded");
640	};
641
642	sub perl_reload() {
643	_perl_reload {
644	warn $_[0];
645	print "$_[0]\n";
646	};
647	}
648
649	register_command "perl-reload", 0, sub {
650	my ($who, $arg) = @_;
651
652	if ($who->flag (FLAG_WIZ)) {
653	_perl_reload {
654	warn $_[0];
655	$who->message ($_[0]);
656	};
657	}
658	};
659
660	#############################################################################
661	# extcmd framework, basically convert ext <msg>
662	# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
663
664	attach_to_players
665	on_extcmd => sub {
666	my ($pl, $buf) = @_;
667
668	my $msg = eval { from_json $buf };
669
670	if (ref $msg) {
671	if (my $cb = $extcmd{$msg->{msgtype}}) {
672	if (my %reply = $cb->[0]->($pl, $msg)) {
673	$pl->ext_reply ($msg->{msgid}, %reply);
674	}
675	}
676	} else {
677	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
678	}
679
680	cf::override;
681	},
682	;
683
684	#############################################################################	675	#############################################################################
685	# load/save/clean perl data associated with a map	676	# load/save/clean perl data associated with a map
686		677
687	*cf::mapsupport::on_clean = sub {	678	*cf::mapsupport::on_clean = sub {
688	my ($map) = @_;	679	my ($map) = @_;
…		…
691	defined $path or return;	682	defined $path or return;
692		683
693	unlink "$path.pst";	684	unlink "$path.pst";
694	};	685	};
695		686
696	# old style persistent data, TODO: remove #d#
697	*cf::mapsupport::on_swapin =
698	*cf::mapsupport::on_load = sub {
699	my ($map) = @_;
700
701	my $path = $map->tmpname;
702	$path = $map->path unless defined $path;
703
704	open my $fh, "<:raw", "$path.cfperl"
705	or return; # no perl data
706
707	my $data = Storable::thaw do { local $/; <$fh> };
708
709	$data->{version} <= 1
710	or return; # too new
711
712	$map->_set_obs ($data->{obs});
713	$map->invoke (EVENT_MAP_UPGRADE);
714	};
715
716	attach_to_maps prio => -10000, package => cf::mapsupport::;	687	cf::map->attach (prio => -10000, package => cf::mapsupport::);
717		688
718	#############################################################################	689	#############################################################################
719	# load/save perl data associated with player->ob objects	690	# load/save perl data associated with player->ob objects
720		691
721	sub all_objects(@) {	692	sub all_objects(@) {
722	@_, map all_objects ($_->inv), @_	693	@_, map all_objects ($_->inv), @_
723	}	694	}
724		695
725	attach_to_players	696	# TODO: compatibility cruft, remove when no longer needed
		697	cf::player->attach (
726	on_load => sub {	698	on_load => sub {
727	my ($pl, $path) = @_;	699	my ($pl, $path) = @_;
728		700
729	for my $o (all_objects $pl->ob) {	701	for my $o (all_objects $pl->ob) {
730	if (my $value = $o->get_ob_key_value ("_perl_data")) {	702	if (my $value = $o->get_ob_key_value ("_perl_data")) {
…		…
732		704
733	%$o = %{ Storable::thaw pack "H*", $value };	705	%$o = %{ Storable::thaw pack "H*", $value };
734	}	706	}
735	}	707	}
736	},	708	},
737	;	709	);
738		710
739	#############################################################################	711	#############################################################################
740	# core extensions - in perl	712
		713	=head2 CORE EXTENSIONS
		714
		715	Functions and methods that extend core crossfire objects.
		716
		717	=over 4
741		718
742	=item cf::player::exists $login	719	=item cf::player::exists $login
743		720
744	Returns true when the given account exists.	721	Returns true when the given account exists.
745		722
…		…
748	sub cf::player::exists($) {	725	sub cf::player::exists($) {
749	cf::player::find $_[0]	726	cf::player::find $_[0]
750	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	727	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
751	}	728	}
752		729
753	=item $player->reply ($npc, $msg[, $flags])	730	=item $player_object->reply ($npc, $msg[, $flags])
754		731
755	Sends a message to the player, as if the npc C<$npc> replied. C<$npc>	732	Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
756	can be C<undef>. Does the right thing when the player is currently in a	733	can be C<undef>. Does the right thing when the player is currently in a
757	dialogue with the given NPC character.	734	dialogue with the given NPC character.
758		735
…		…
785	$msg{msgid} = $id;	762	$msg{msgid} = $id;
786		763
787	$self->send ("ext " . to_json \%msg);	764	$self->send ("ext " . to_json \%msg);
788	}	765	}
789		766
		767	=item $player_object->may ("access")
		768
		769	Returns wether the given player is authorized to access resource "access"
		770	(e.g. "command_wizcast").
		771
		772	=cut
		773
		774	sub cf::object::player::may {
		775	my ($self, $access) = @_;
		776
		777	$self->flag (cf::FLAG_WIZ) \|\|
		778	(ref $cf::CFG{"may_$access"}
		779	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
		780	: $cf::CFG{"may_$access"})
		781	}
		782
		783	=cut
		784
790	#############################################################################	785	#############################################################################
791	# map scripting support	786
		787	=head2 SAFE SCRIPTING
		788
		789	Functions that provide a safe environment to compile and execute
		790	snippets of perl code without them endangering the safety of the server
		791	itself. Looping constructs, I/O operators and other built-in functionality
		792	is not available in the safe scripting environment, and the number of
		793	functions and methods that can be called is greatly reduced.
		794
		795	=cut
792		796
793	our $safe = new Safe "safe";	797	our $safe = new Safe "safe";
794	our $safe_hole = new Safe::Hole;	798	our $safe_hole = new Safe::Hole;
795		799
796	$SIG{FPE} = 'IGNORE';	800	$SIG{FPE} = 'IGNORE';
797		801
798	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	802	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
799		803
800	# here we export the classes and methods available to script code	804	# here we export the classes and methods available to script code
801		805
		806	=pod
		807
		808	The following fucntions and emthods are available within a safe environment:
		809
		810	cf::object contr pay_amount pay_player map
		811	cf::object::player player
		812	cf::player peaceful
		813	cf::map trigger
		814
		815	=cut
		816
802	for (	817	for (
803	["cf::object" => qw(contr pay_amount pay_player)],	818	["cf::object" => qw(contr pay_amount pay_player map)],
804	["cf::object::player" => qw(player)],	819	["cf::object::player" => qw(player)],
805	["cf::player" => qw(peaceful)],	820	["cf::player" => qw(peaceful)],
		821	["cf::map" => qw(trigger)],
806	) {	822	) {
807	no strict 'refs';	823	no strict 'refs';
808	my ($pkg, @funs) = @$_;	824	my ($pkg, @funs) = @$_;
809	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	825	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
810	for @funs;	826	for @funs;
811	}	827	}
		828
		829	=over 4
		830
		831	=item @retval = safe_eval $code, [var => value, ...]
		832
		833	Compiled and executes the given perl code snippet. additional var/value
		834	pairs result in temporary local (my) scalar variables of the given name
		835	that are available in the code snippet. Example:
		836
		837	my $five = safe_eval '$first + $second', first => 1, second => 4;
		838
		839	=cut
812		840
813	sub safe_eval($;@) {	841	sub safe_eval($;@) {
814	my ($code, %vars) = @_;	842	my ($code, %vars) = @_;
815		843
816	my $qcode = $code;	844	my $qcode = $code;
…		…
839	}	867	}
840		868
841	wantarray ? @res : $res[0]	869	wantarray ? @res : $res[0]
842	}	870	}
843		871
		872	=item cf::register_script_function $function => $cb
		873
		874	Register a function that can be called from within map/npc scripts. The
		875	function should be reasonably secure and should be put into a package name
		876	like the extension.
		877
		878	Example: register a function that gets called whenever a map script calls
		879	C<rent::overview>, as used by the C<rent> extension.
		880
		881	cf::register_script_function "rent::overview" => sub {
		882	...
		883	};
		884
		885	=cut
		886
844	sub register_script_function {	887	sub register_script_function {
845	my ($fun, $cb) = @_;	888	my ($fun, $cb) = @_;
846		889
847	no strict 'refs';	890	no strict 'refs';
848	*{"safe::$fun"} = $safe_hole->wrap ($cb);	891	*{"safe::$fun"} = $safe_hole->wrap ($cb);
849	}	892	}
850		893
		894	=back
		895
		896	=cut
		897
		898	#############################################################################
		899
		900	=head2 EXTENSION DATABASE SUPPORT
		901
		902	Crossfire maintains a very simple database for extension use. It can
		903	currently store anything that can be serialised using Storable, which
		904	excludes objects.
		905
		906	The parameter C<$family> should best start with the name of the extension
		907	using it, it should be unique.
		908
		909	=over 4
		910
		911	=item $hashref = cf::db_get $family
		912
		913	Return a hashref for use by the extension C<$family>, which can be
		914	modified. After modifications, you have to call C<cf::db_dirty> or
		915	C<cf::db_sync>.
		916
		917	=item $value = cf::db_get $family => $key
		918
		919	Returns a single value from the database
		920
		921	=item cf::db_put $family => $hashref
		922
		923	Stores the given family hashref into the database. Updates are delayed, if
		924	you want the data to be synced to disk immediately, use C<cf::db_sync>.
		925
		926	=item cf::db_put $family => $key => $value
		927
		928	Stores the given C<$value> in the family hash. Updates are delayed, if you
		929	want the data to be synced to disk immediately, use C<cf::db_sync>.
		930
		931	=item cf::db_dirty
		932
		933	Marks the database as dirty, to be updated at a later time.
		934
		935	=item cf::db_sync
		936
		937	Immediately write the database to disk I<if it is dirty>.
		938
		939	=cut
		940
		941	our $DB;
		942
		943	{
		944	my $path = cf::localdir . "/database.pst";
		945
		946	sub db_load() {
		947	warn "loading database $path\n";#d# remove later
		948	$DB = stat $path ? Storable::retrieve $path : { };
		949	}
		950
		951	my $pid;
		952
		953	sub db_save() {
		954	warn "saving database $path\n";#d# remove later
		955	waitpid $pid, 0 if $pid;
		956	if (0 == ($pid = fork)) {
		957	$DB->{_meta}{version} = 1;
		958	Storable::nstore $DB, "$path~";
		959	rename "$path~", $path;
		960	cf::_exit 0 if defined $pid;
		961	}
		962	}
		963
		964	my $dirty;
		965
		966	sub db_sync() {
		967	db_save if $dirty;
		968	undef $dirty;
		969	}
		970
		971	my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
		972	db_sync;
		973	});
		974
		975	sub db_dirty() {
		976	$dirty = 1;
		977	$idle->start;
		978	}
		979
		980	sub db_get($;$) {
		981	@_ >= 2
		982	? $DB->{$_[0]}{$_[1]}
		983	: ($DB->{$_[0]} \|\|= { })
		984	}
		985
		986	sub db_put($$;$) {
		987	if (@_ >= 3) {
		988	$DB->{$_[0]}{$_[1]} = $_[2];
		989	} else {
		990	$DB->{$_[0]} = $_[1];
		991	}
		992	db_dirty;
		993	}
		994
		995	cf::global->attach (
		996	prio => 10000,
		997	on_cleanup => sub {
		998	db_sync;
		999	},
		1000	);
		1001	}
		1002
851	#############################################################################	1003	#############################################################################
852	# the server's main()	1004	# the server's main()
853		1005
		1006	sub cfg_load {
		1007	open my $fh, "<:utf8", cf::confdir . "/config"
		1008	or return;
		1009
		1010	local $/;
		1011	*CFG = YAML::Syck::Load <$fh>;
		1012	}
		1013
854	sub main {	1014	sub main {
		1015	cfg_load;
		1016	db_load;
		1017	load_extensions;
855	Event::loop;	1018	Event::loop;
856	}	1019	}
857		1020
858	#############################################################################	1021	#############################################################################
859	# initialisation	1022	# initialisation
860		1023
		1024	sub _perl_reload(&) {
		1025	my ($msg) = @_;
		1026
		1027	$msg->("reloading...");
		1028
		1029	eval {
		1030	# cancel all watchers
		1031	for (Event::all_watchers) {
		1032	$_->cancel if $_->data & WF_AUTOCANCEL;
		1033	}
		1034
		1035	# unload all extensions
		1036	for (@exts) {
		1037	$msg->("unloading <$_>");
		1038	unload_extension $_;
		1039	}
		1040
		1041	# unload all modules loaded from $LIBDIR
		1042	while (my ($k, $v) = each %INC) {
		1043	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		1044
		1045	$msg->("removing <$k>");
		1046	delete $INC{$k};
		1047
		1048	$k =~ s/\.pm$//;
		1049	$k =~ s/\//::/g;
		1050
		1051	if (my $cb = $k->can ("unload_module")) {
		1052	$cb->();
		1053	}
		1054
		1055	Symbol::delete_package $k;
		1056	}
		1057
		1058	# sync database to disk
		1059	cf::db_sync;
		1060
		1061	# get rid of safe::, as good as possible
		1062	Symbol::delete_package "safe::$_"
		1063	for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
		1064
		1065	# remove register_script_function callbacks
		1066	# TODO
		1067
		1068	# unload cf.pm "a bit"
		1069	delete $INC{"cf.pm"};
		1070
		1071	# don't, removes xs symbols, too,
		1072	# and global variables created in xs
		1073	#Symbol::delete_package __PACKAGE__;
		1074
		1075	# reload cf.pm
		1076	$msg->("reloading cf.pm");
		1077	require cf;
		1078
		1079	# load config and database again
		1080	cf::cfg_load;
		1081	cf::db_load;
		1082
		1083	# load extensions
		1084	$msg->("load extensions");
		1085	cf::load_extensions;
		1086
		1087	# reattach attachments to objects
		1088	$msg->("reattach");
		1089	_global_reattach;
		1090	};
		1091	$msg->($@) if $@;
		1092
		1093	$msg->("reloaded");
		1094	};
		1095
		1096	sub perl_reload() {
		1097	_perl_reload {
		1098	warn $_[0];
		1099	print "$_[0]\n";
		1100	};
		1101	}
		1102
861	register "<global>", __PACKAGE__;	1103	register "<global>", __PACKAGE__;
862		1104
		1105	register_command "perl-reload" => sub {
		1106	my ($who, $arg) = @_;
		1107
		1108	if ($who->flag (FLAG_WIZ)) {
		1109	_perl_reload {
		1110	warn $_[0];
		1111	$who->message ($_[0]);
		1112	};
		1113	}
		1114	};
		1115
863	unshift @INC, $LIBDIR;	1116	unshift @INC, $LIBDIR;
864		1117
865	load_extensions;
866
867	$TICK_WATCHER = Event->timer (	1118	$TICK_WATCHER = Event->timer (
868	prio => 1,	1119	prio => 0,
869	at => $NEXT_TICK \|\| 1,	1120	at => $NEXT_TICK \|\| 1,
		1121	data => WF_AUTOCANCEL,
870	cb => sub {	1122	cb => sub {
871	cf::server_tick; # one server iteration	1123	cf::server_tick; # one server iteration
872		1124
873	my $NOW = Event::time;	1125	my $NOW = Event::time;
874	$NEXT_TICK += $TICK;	1126	$NEXT_TICK += $TICK;
875		1127
876	# if we are delayed by four ticks, skip them all	1128	# if we are delayed by four ticks or more, skip them all
877	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;	1129	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
878		1130
879	$TICK_WATCHER->at ($NEXT_TICK);	1131	$TICK_WATCHER->at ($NEXT_TICK);
880	$TICK_WATCHER->start;	1132	$TICK_WATCHER->start;
881	},	1133	},
882	);	1134	);
883		1135
884	_reload_2;	1136	IO::AIO::max_poll_time $TICK * 0.2;
		1137
		1138	Event->io (fd => IO::AIO::poll_fileno,
		1139	poll => 'r',
		1140	prio => 5,
		1141	data => WF_AUTOCANCEL,
		1142	cb => \&IO::AIO::poll_cb);
885		1143
886	1	1144	1
887		1145

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.54 by root, Tue Aug 29 14:49:28 2006 UTC vs. Revision 1.93 by root, Thu Dec 21 22:41:35 2006 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.54 by root, Tue Aug 29 14:49:28 2006 UTC vs.
Revision 1.93 by root, Thu Dec 21 22:41:35 2006 UTC