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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.96 by root, Fri Dec 22 06:02:29 2006 UTC vs.
Revision 1.109 by root, Sun Dec 31 22:23:12 2006 UTC

…		…
8	use Storable;	8	use Storable;
9	use Opcode;	9	use Opcode;
10	use Safe;	10	use Safe;
11	use Safe::Hole;	11	use Safe::Hole;
12		12
13	use Coro;	13	use Coro 3.3;
14	use Coro::Event;	14	use Coro::Event;
15	use Coro::Timer;	15	use Coro::Timer;
16	use Coro::Signal;	16	use Coro::Signal;
17	use Coro::Semaphore;	17	use Coro::Semaphore;
18
19	use IO::AIO;	18	use Coro::AIO;
		19
		20	use Digest::MD5;
		21	use Fcntl;
		22	use IO::AIO 2.31 ();
20	use YAML::Syck ();	23	use YAML::Syck ();
21	use Time::HiRes;	24	use Time::HiRes;
22		25
23	use Event; $Event::Eval = 1; # no idea why this is required, but it is	26	use Event; $Event::Eval = 1; # no idea why this is required, but it is
24		27
25	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	28	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
26	$YAML::Syck::ImplicitUnicode = 1;	29	$YAML::Syck::ImplicitUnicode = 1;
27		30
28	$Coro::main->prio (Coro::PRIO_MIN);	31	$Coro::main->prio (2); # run main coroutine ("the server") with very high priority
29		32
30	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
31		34
32	our %COMMAND = ();	35	our %COMMAND = ();
33	our %COMMAND_TIME = ();	36	our %COMMAND_TIME = ();
34	our %EXTCMD = ();	37	our %EXTCMD = ();
35		38
36	_init_vars;
37
38	our @EVENT;	39	our @EVENT;
39	our $LIBDIR = datadir . "/ext";	40	our $LIBDIR = datadir . "/ext";
40		41
41	our $TICK = MAX_TIME * 1e-6;	42	our $TICK = MAX_TIME * 1e-6;
42	our $TICK_WATCHER;	43	our $TICK_WATCHER;
43	our $NEXT_TICK;	44	our $NEXT_TICK;
		45	our $NOW;
44		46
45	our %CFG;	47	our %CFG;
46		48
47	our $UPTIME; $UPTIME \|\|= time;	49	our $UPTIME; $UPTIME \|\|= time;
		50	our $RUNTIME;
		51
		52	our %MAP; # all maps
		53	our $LINK_MAP; # the special {link} map
		54	our $FREEZE;
		55	our $RANDOM_MAPS = cf::localdir . "/random";
		56	our %EXT_CORO;
		57
		58	binmode STDOUT;
		59	binmode STDERR;
		60
		61	# read virtual server time, if available
		62	unless ($RUNTIME \|\| !-e cf::localdir . "/runtime") {
		63	open my $fh, "<", cf::localdir . "/runtime"
		64	or die "unable to read runtime file: $!";
		65	$RUNTIME = <$fh> + 0.;
		66	}
		67
		68	mkdir cf::localdir;
		69	mkdir cf::localdir . "/" . cf::playerdir;
		70	mkdir cf::localdir . "/" . cf::tmpdir;
		71	mkdir cf::localdir . "/" . cf::uniquedir;
		72	mkdir $RANDOM_MAPS;
		73
		74	# a special map that is always available
		75	our $LINK_MAP;
48		76
49	#############################################################################	77	#############################################################################
50		78
51	=head2 GLOBAL VARIABLES	79	=head2 GLOBAL VARIABLES
52		80
53	=over 4	81	=over 4
54		82
55	=item $cf::UPTIME	83	=item $cf::UPTIME
56		84
57	The timestamp of the server start (so not actually an uptime).	85	The timestamp of the server start (so not actually an uptime).
		86
		87	=item $cf::RUNTIME
		88
		89	The time this server has run, starts at 0 and is increased by $cf::TICK on
		90	every server tick.
58		91
59	=item $cf::LIBDIR	92	=item $cf::LIBDIR
60		93
61	The perl library directory, where extensions and cf-specific modules can	94	The perl library directory, where extensions and cf-specific modules can
62	be found. It will be added to C<@INC> automatically.	95	be found. It will be added to C<@INC> automatically.
		96
		97	=item $cf::NOW
		98
		99	The time of the last (current) server tick.
63		100
64	=item $cf::TICK	101	=item $cf::TICK
65		102
66	The interval between server ticks, in seconds.	103	The interval between server ticks, in seconds.
67		104
…		…
75	=cut	112	=cut
76		113
77	BEGIN {	114	BEGIN {
78	*CORE::GLOBAL::warn = sub {	115	*CORE::GLOBAL::warn = sub {
79	my $msg = join "", @_;	116	my $msg = join "", @_;
		117	utf8::encode $msg;
		118
80	$msg .= "\n"	119	$msg .= "\n"
81	unless $msg =~ /\n$/;	120	unless $msg =~ /\n$/;
82		121
83	print STDERR "cfperl: $msg";
84	LOG llevError, "cfperl: $msg";	122	LOG llevError, "cfperl: $msg";
85	};	123	};
86	}	124	}
87		125
88	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	126	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
93	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	131	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
94		132
95	# we bless all objects into (empty) derived classes to force a method lookup	133	# we bless all objects into (empty) derived classes to force a method lookup
96	# within the Safe compartment.	134	# within the Safe compartment.
97	for my $pkg (qw(	135	for my $pkg (qw(
98	cf::global	136	cf::global cf::attachable
99	cf::object cf::object::player	137	cf::object cf::object::player
100	cf::client cf::player	138	cf::client cf::player
101	cf::arch cf::living	139	cf::arch cf::living
102	cf::map cf::party cf::region	140	cf::map cf::party cf::region
103	)) {	141	)) {
…		…
141	sub to_json($) {	179	sub to_json($) {
142	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	180	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
143	JSON::Syck::Dump $_[0]	181	JSON::Syck::Dump $_[0]
144	}	182	}
145		183
		184	=item cf::sync_job { BLOCK }
		185
		186	The design of crossfire+ requires that the main coro ($Coro::main) is
		187	always able to handle events or runnable, as crossfire+ is only partly
		188	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
		189
		190	If it must be done, put the blocking parts into C<sync_job>. This will run
		191	the given BLOCK in another coroutine while waiting for the result. The
		192	server will be frozen during this time, so the block should either finish
		193	fast or be very important.
		194
		195	=cut
		196
		197	sub sync_job(&) {
		198	my ($job) = @_;
		199
		200	my $busy = 1;
		201	my @res;
		202
		203	# TODO: use suspend/resume instead
		204	local $FREEZE = 1;
		205
		206	my $coro = Coro::async {
		207	@res = eval { $job->() };
		208	warn $@ if $@;
		209	undef $busy;
		210	};
		211
		212	if ($Coro::current == $Coro::main) {
		213	$coro->prio (Coro::PRIO_MAX);
		214	while ($busy) {
		215	Coro::cede_notself;
		216	Event::one_event unless Coro::nready;
		217	}
		218	} else {
		219	$coro->join;
		220	}
		221
		222	wantarray ? @res : $res[0]
		223	}
		224
		225	=item $coro = cf::coro { BLOCK }
		226
		227	Creates and returns a new coro. This coro is automcatially being canceled
		228	when the extension calling this is being unloaded.
		229
		230	=cut
		231
		232	sub coro(&) {
		233	my $cb = shift;
		234
		235	my $coro; $coro = async {
		236	eval {
		237	$cb->();
		238	};
		239	warn $@ if $@;
		240	};
		241
		242	$coro->on_destroy (sub {
		243	delete $EXT_CORO{$coro+0};
		244	});
		245	$EXT_CORO{$coro+0} = $coro;
		246
		247	$coro
		248	}
		249
		250	sub write_runtime {
		251	my $runtime = cf::localdir . "/runtime";
		252
		253	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
		254	or return;
		255
		256	my $value = $cf::RUNTIME;
		257	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		258	and return;
		259
		260	aio_fsync $fh
		261	and return;
		262
		263	close $fh
		264	or return;
		265
		266	aio_rename "$runtime~", $runtime
		267	and return;
		268
		269	1
		270	}
		271
146	=back	272	=back
147		273
148	=cut	274	=cut
		275
		276	#############################################################################
		277
		278	package cf::path;
		279
		280	sub new {
		281	my ($class, $path, $base) = @_;
		282
		283	my $self = bless { }, $class;
		284
		285	if ($path =~ s{^\?random/}{}) {
		286	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
		287	$self->{random} = cf::from_json $data;
		288	} else {
		289	if ($path =~ s{^~([^/]+)?}{}) {
		290	$self->{user_rel} = 1;
		291
		292	if (defined $1) {
		293	$self->{user} = $1;
		294	} elsif ($base =~ m{^~([^/]+)/}) {
		295	$self->{user} = $1;
		296	} else {
		297	warn "cannot resolve user-relative path without user <$path,$base>\n";
		298	}
		299	} elsif ($path =~ /^\//) {
		300	# already absolute
		301	} else {
		302	$base =~ s{[^/]+/?$}{};
		303	return $class->new ("$base/$path");
		304	}
		305
		306	for ($path) {
		307	redo if s{/\.?/}{/};
		308	redo if s{/[^/]+/\.\./}{/};
		309	}
		310	}
		311
		312	$self->{path} = $path;
		313
		314	$self
		315	}
		316
		317	# the name / primary key / in-game path
		318	sub as_string {
		319	my ($self) = @_;
		320
		321	$self->{user_rel} ? "~$self->{user}$self->{path}"
		322	: $self->{random} ? "?random/$self->{path}"
		323	: $self->{path}
		324	}
		325
		326	# the displayed name, this is a one way mapping
		327	sub visible_name {
		328	my ($self) = @_;
		329
		330	# if (my $rmp = $self->{random}) {
		331	# # todo: be more intelligent about this
		332	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
		333	# } else {
		334	$self->as_string
		335	# }
		336	}
		337
		338	# escape the /'s in the path
		339	sub _escaped_path {
		340	# ∕ is U+2215
		341	(my $path = $_[0]{path}) =~ s/\//∕/g;
		342	$path
		343	}
		344
		345	# the original (read-only) location
		346	sub load_path {
		347	my ($self) = @_;
		348
		349	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
		350	}
		351
		352	# the temporary/swap location
		353	sub save_path {
		354	my ($self) = @_;
		355
		356	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
		357	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
		358	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
		359	}
		360
		361	# the unique path, might be eq to save_path
		362	sub uniq_path {
		363	my ($self) = @_;
		364
		365	$self->{user_rel} \|\| $self->{random}
		366	? undef
		367	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
		368	}
		369
		370	# return random map parameters, or undef
		371	sub random_map_params {
		372	my ($self) = @_;
		373
		374	$self->{random}
		375	}
		376
		377	# this is somewhat ugly, but style maps do need special treatment
		378	sub is_style_map {
		379	$_[0]{path} =~ m{^/styles/}
		380	}
		381
		382	package cf;
149		383
150	#############################################################################	384	#############################################################################
151		385
152	=head2 ATTACHABLE OBJECTS	386	=head2 ATTACHABLE OBJECTS
153		387
…		…
269	exception.	503	exception.
270		504
271	=cut	505	=cut
272		506
273	# the following variables are defined in .xs and must not be re-created	507	# the following variables are defined in .xs and must not be re-created
274	our @CB_GLOBAL = (); # registry for all global events	508	our @CB_GLOBAL = (); # registry for all global events
		509	our @CB_ATTACHABLE = (); # registry for all attachables
275	our @CB_OBJECT = (); # all objects (should not be used except in emergency)	510	our @CB_OBJECT = (); # all objects (should not be used except in emergency)
276	our @CB_PLAYER = ();	511	our @CB_PLAYER = ();
277	our @CB_CLIENT = ();	512	our @CB_CLIENT = ();
278	our @CB_TYPE = (); # registry for type (cf-object class) based events	513	our @CB_TYPE = (); # registry for type (cf-object class) based events
279	our @CB_MAP = ();	514	our @CB_MAP = ();
280		515
281	my %attachment;	516	my %attachment;
282		517
283	sub _attach_cb($$$$) {	518	sub _attach_cb($$$$) {
284	my ($registry, $event, $prio, $cb) = @_;	519	my ($registry, $event, $prio, $cb) = @_;
…		…
289		524
290	@{$registry->[$event]} = sort	525	@{$registry->[$event]} = sort
291	{ $a->[0] cmp $b->[0] }	526	{ $a->[0] cmp $b->[0] }
292	@{$registry->[$event] \|\| []}, $cb;	527	@{$registry->[$event] \|\| []}, $cb;
293	}	528	}
		529
		530	# hack
		531	my %attachable_klass = map +($_ => 1), KLASS_OBJECT, KLASS_CLIENT, KLASS_PLAYER, KLASS_MAP;
294		532
295	# attach handles attaching event callbacks	533	# attach handles attaching event callbacks
296	# the only thing the caller has to do is pass the correct	534	# the only thing the caller has to do is pass the correct
297	# registry (== where the callback attaches to).	535	# registry (== where the callback attaches to).
298	sub _attach {	536	sub _attach {
…		…
300		538
301	my $object_type;	539	my $object_type;
302	my $prio = 0;	540	my $prio = 0;
303	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;	541	my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
304		542
		543	#TODO: get rid of this hack
		544	if ($attachable_klass{$klass}) {
		545	%cb_id = (%cb_id, map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == KLASS_ATTACHABLE, 0 .. $#EVENT);
		546	}
		547
305	while (@arg) {	548	while (@arg) {
306	my $type = shift @arg;	549	my $type = shift @arg;
307		550
308	if ($type eq "prio") {	551	if ($type eq "prio") {
309	$prio = shift @arg;	552	$prio = shift @arg;
…		…
384	my ($obj, $name) = @_;	627	my ($obj, $name) = @_;
385		628
386	exists $obj->{_attachment}{$name}	629	exists $obj->{_attachment}{$name}
387	}	630	}
388		631
389	for my $klass (qw(GLOBAL OBJECT PLAYER CLIENT MAP)) {	632	for my $klass (qw(ATTACHABLE GLOBAL OBJECT PLAYER CLIENT MAP)) {
390	eval "#line " . __LINE__ . " 'cf.pm'	633	eval "#line " . __LINE__ . " 'cf.pm'
391	sub cf::\L$klass\E::_attach_registry {	634	sub cf::\L$klass\E::_attach_registry {
392	(\\\@CB_$klass, KLASS_$klass)	635	(\\\@CB_$klass, KLASS_$klass)
393	}	636	}
394		637
…		…
447	=cut	690	=cut
448		691
449	#############################################################################	692	#############################################################################
450	# object support	693	# object support
451		694
452	sub instantiate {
453	my ($obj, $data) = @_;
454
455	$data = from_json $data;
456
457	for (@$data) {
458	my ($name, $args) = @$_;
459
460	$obj->attach ($name, %{$args \|\| {} });
461	}
462	}
463
464	# basically do the same as instantiate, without calling instantiate
465	sub reattach {	695	sub reattach {
		696	# basically do the same as instantiate, without calling instantiate
466	my ($obj) = @_;	697	my ($obj) = @_;
		698
467	my $registry = $obj->registry;	699	my $registry = $obj->registry;
468		700
469	@$registry = ();	701	@$registry = ();
470		702
471	delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} \|\| {} };	703	delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} \|\| {} };
…		…
480	warn "object uses attachment '$name' that is not available, postponing.\n";	712	warn "object uses attachment '$name' that is not available, postponing.\n";
481	}	713	}
482	}	714	}
483	}	715	}
484		716
485	sub object_freezer_save {	717	cf::attachable->attach (
486	my ($filename, $rdata, $objs) = @_;
487
488	if (length $$rdata) {
489	warn sprintf "saving %s (%d,%d)\n",
490	$filename, length $$rdata, scalar @$objs;
491
492	if (open my $fh, ">:raw", "$filename~") {
493	chmod SAVE_MODE, $fh;
494	syswrite $fh, $$rdata;
495	close $fh;
496
497	if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
498	chmod SAVE_MODE, $fh;
499	syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
500	close $fh;
501	rename "$filename.pst~", "$filename.pst";
502	} else {
503	unlink "$filename.pst";
504	}
505
506	rename "$filename~", $filename;
507	} else {
508	warn "FATAL: $filename~: $!\n";
509	}
510	} else {
511	unlink $filename;
512	unlink "$filename.pst";
513	}
514	}
515
516	sub object_freezer_as_string {
517	my ($rdata, $objs) = @_;
518
519	use Data::Dumper;
520
521	$$rdata . Dumper $objs
522	}
523
524	sub object_thawer_load {
525	my ($filename) = @_;
526
527	local $/;
528
529	my $av;
530
531	#TODO: use sysread etc.
532	if (open my $data, "<:raw:perlio", $filename) {
533	$data = <$data>;
534	if (open my $pst, "<:raw:perlio", "$filename.pst") {
535	$av = eval { (Storable::thaw <$pst>)->{objs} };
536	}
537	return ($data, $av);
538	}
539
540	()
541	}
542
543	cf::object->attach (
544	prio => -1000000,	718	prio => -1000000,
		719	on_instantiate => sub {
		720	my ($obj, $data) = @_;
		721
		722	$data = from_json $data;
		723
		724	for (@$data) {
		725	my ($name, $args) = @$_;
		726
		727	$obj->attach ($name, %{$args \|\| {} });
		728	}
		729	},
		730	on_reattach => \&reattach,
545	on_clone => sub {	731	on_clone => sub {
546	my ($src, $dst) = @_;	732	my ($src, $dst) = @_;
547		733
548	@{$dst->registry} = @{$src->registry};	734	@{$dst->registry} = @{$src->registry};
549		735
…		…
551		737
552	%{$dst->{_attachment}} = %{$src->{_attachment}}	738	%{$dst->{_attachment}} = %{$src->{_attachment}}
553	if exists $src->{_attachment};	739	if exists $src->{_attachment};
554	},	740	},
555	);	741	);
		742
		743	sub object_freezer_save {
		744	my ($filename, $rdata, $objs) = @_;
		745
		746	sync_job {
		747	if (length $$rdata) {
		748	warn sprintf "saving %s (%d,%d)\n",
		749	$filename, length $$rdata, scalar @$objs;
		750
		751	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
		752	chmod SAVE_MODE, $fh;
		753	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
		754	aio_fsync $fh;
		755	close $fh;
		756
		757	if (@$objs) {
		758	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
		759	chmod SAVE_MODE, $fh;
		760	my $data = Storable::nfreeze { version => 1, objs => $objs };
		761	aio_write $fh, 0, (length $data), $data, 0;
		762	aio_fsync $fh;
		763	close $fh;
		764	aio_rename "$filename.pst~", "$filename.pst";
		765	}
		766	} else {
		767	aio_unlink "$filename.pst";
		768	}
		769
		770	aio_rename "$filename~", $filename;
		771	} else {
		772	warn "FATAL: $filename~: $!\n";
		773	}
		774	} else {
		775	aio_unlink $filename;
		776	aio_unlink "$filename.pst";
		777	}
		778	}
		779	}
		780
		781	sub object_freezer_as_string {
		782	my ($rdata, $objs) = @_;
		783
		784	use Data::Dumper;
		785
		786	$$rdata . Dumper $objs
		787	}
		788
		789	sub object_thawer_load {
		790	my ($filename) = @_;
		791
		792	my ($data, $av);
		793
		794	(aio_load $filename, $data) >= 0
		795	or return;
		796
		797	unless (aio_stat "$filename.pst") {
		798	(aio_load "$filename.pst", $av) >= 0
		799	or return;
		800	$av = eval { (Storable::thaw <$av>)->{objs} };
		801	}
		802
		803	return ($data, $av);
		804	}
556		805
557	#############################################################################	806	#############################################################################
558	# command handling &c	807	# command handling &c
559		808
560	=item cf::register_command $name => \&callback($ob,$args);	809	=item cf::register_command $name => \&callback($ob,$args);
…		…
886		1135
887	if (@{ $ns->{query_queue} } == @$queue) {	1136	if (@{ $ns->{query_queue} } == @$queue) {
888	if (@$queue) {	1137	if (@$queue) {
889	$ns->send_packet ($ns->{query_queue}[0][0]);	1138	$ns->send_packet ($ns->{query_queue}[0][0]);
890	} else {	1139	} else {
891	$ns->state (ST_PLAYING);	1140	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
892	}	1141	}
893	}	1142	}
894	},	1143	},
895	);	1144	);
896		1145
…		…
908	my $coro; $coro = async {	1157	my $coro; $coro = async {
909	eval {	1158	eval {
910	$cb->();	1159	$cb->();
911	};	1160	};
912	warn $@ if $@;	1161	warn $@ if $@;
913	warn "cancel myself\n";#d#	1162	};
		1163
		1164	$coro->on_destroy (sub {
914	delete $self->{_coro}{$coro+0};	1165	delete $self->{_coro}{$coro+0};
915	};	1166	});
916		1167
917	$self->{_coro}{$coro+0} = $coro;	1168	$self->{_coro}{$coro+0} = $coro;
		1169
		1170	$coro
918	}	1171	}
919		1172
920	cf::client->attach (	1173	cf::client->attach (
921	on_destroy => sub {	1174	on_destroy => sub {
922	my ($ns) = @_;	1175	my ($ns) = @_;
923		1176
924	warn "cancel $_" for values %{ $ns->{_coro} \|\| {} };#d#
925	$_->cancel for values %{ $ns->{_coro} \|\| {} };	1177	$_->cancel for values %{ (delete $ns->{_coro}) \|\| {} };
926	},	1178	},
927	);	1179	);
928		1180
929	=back	1181	=back
930		1182
…		…
1155	local $/;	1407	local $/;
1156	*CFG = YAML::Syck::Load <$fh>;	1408	*CFG = YAML::Syck::Load <$fh>;
1157	}	1409	}
1158		1410
1159	sub main {	1411	sub main {
		1412	# we must not ever block the main coroutine
		1413	local $Coro::idle = sub {
		1414	Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d#
		1415	(Coro::unblock_sub {
		1416	Event::one_event;
		1417	})->();
		1418	};
		1419
1160	cfg_load;	1420	cfg_load;
1161	db_load;	1421	db_load;
1162	load_extensions;	1422	load_extensions;
1163	Event::loop;	1423	Event::loop;
1164	}	1424	}
1165		1425
1166	#############################################################################	1426	#############################################################################
1167	# initialisation	1427	# initialisation
1168		1428
1169	sub _perl_reload(&) {	1429	sub perl_reload() {
1170	my ($msg) = @_;	1430	# can/must only be called in main
		1431	if ($Coro::current != $Coro::main) {
		1432	warn "can only reload from main coroutine\n";
		1433	return;
		1434	}
1171		1435
1172	$msg->("reloading...");	1436	warn "reloading...";
		1437
		1438	local $FREEZE = 1;
		1439	cf::emergency_save;
1173		1440
1174	eval {	1441	eval {
		1442	# if anything goes wrong in here, we should simply crash as we already saved
		1443
1175	# cancel all watchers	1444	# cancel all watchers
1176	for (Event::all_watchers) {	1445	for (Event::all_watchers) {
1177	$_->cancel if $_->data & WF_AUTOCANCEL;	1446	$_->cancel if $_->data & WF_AUTOCANCEL;
1178	}	1447	}
1179		1448
		1449	# cancel all extension coros
		1450	$_->cancel for values %EXT_CORO;
		1451	%EXT_CORO = ();
		1452
1180	# unload all extensions	1453	# unload all extensions
1181	for (@exts) {	1454	for (@exts) {
1182	$msg->("unloading <$_>");	1455	warn "unloading <$_>";
1183	unload_extension $_;	1456	unload_extension $_;
1184	}	1457	}
1185		1458
1186	# unload all modules loaded from $LIBDIR	1459	# unload all modules loaded from $LIBDIR
1187	while (my ($k, $v) = each %INC) {	1460	while (my ($k, $v) = each %INC) {
1188	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	1461	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1189		1462
1190	$msg->("removing <$k>");	1463	warn "removing <$k>";
1191	delete $INC{$k};	1464	delete $INC{$k};
1192		1465
1193	$k =~ s/\.pm$//;	1466	$k =~ s/\.pm$//;
1194	$k =~ s/\//::/g;	1467	$k =~ s/\//::/g;
1195		1468
…		…
1200	Symbol::delete_package $k;	1473	Symbol::delete_package $k;
1201	}	1474	}
1202		1475
1203	# sync database to disk	1476	# sync database to disk
1204	cf::db_sync;	1477	cf::db_sync;
		1478	IO::AIO::flush;
1205		1479
1206	# get rid of safe::, as good as possible	1480	# get rid of safe::, as good as possible
1207	Symbol::delete_package "safe::$_"	1481	Symbol::delete_package "safe::$_"
1208	for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);	1482	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
1209		1483
1210	# remove register_script_function callbacks	1484	# remove register_script_function callbacks
1211	# TODO	1485	# TODO
1212		1486
1213	# unload cf.pm "a bit"	1487	# unload cf.pm "a bit"
…		…
1216	# don't, removes xs symbols, too,	1490	# don't, removes xs symbols, too,
1217	# and global variables created in xs	1491	# and global variables created in xs
1218	#Symbol::delete_package __PACKAGE__;	1492	#Symbol::delete_package __PACKAGE__;
1219		1493
1220	# reload cf.pm	1494	# reload cf.pm
1221	$msg->("reloading cf.pm");	1495	warn "reloading cf.pm";
1222	require cf;	1496	require cf;
		1497	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1223		1498
1224	# load config and database again	1499	# load config and database again
1225	cf::cfg_load;	1500	cf::cfg_load;
1226	cf::db_load;	1501	cf::db_load;
1227		1502
1228	# load extensions	1503	# load extensions
1229	$msg->("load extensions");	1504	warn "load extensions";
1230	cf::load_extensions;	1505	cf::load_extensions;
1231		1506
1232	# reattach attachments to objects	1507	# reattach attachments to objects
1233	$msg->("reattach");	1508	warn "reattach";
1234	_global_reattach;	1509	_global_reattach;
1235	};	1510	};
1236	$msg->($@) if $@;
1237		1511
1238	$msg->("reloaded");	1512	if ($@) {
		1513	warn $@;
		1514	warn "error while reloading, exiting.";
		1515	exit 1;
		1516	}
		1517
		1518	warn "reloaded successfully";
1239	};	1519	};
1240		1520
1241	sub perl_reload() {	1521	#############################################################################
1242	_perl_reload {	1522
1243	warn $_[0];	1523	unless ($LINK_MAP) {
1244	print "$_[0]\n";	1524	$LINK_MAP = cf::map::new;
1245	};	1525
		1526	$LINK_MAP->width (41);
		1527	$LINK_MAP->height (41);
		1528	$LINK_MAP->alloc;
		1529	$LINK_MAP->path ("{link}");
		1530	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
		1531	$LINK_MAP->in_memory (MAP_IN_MEMORY);
1246	}	1532	}
1247		1533
1248	register "<global>", __PACKAGE__;	1534	register "<global>", __PACKAGE__;
1249		1535
1250	register_command "perl-reload" => sub {	1536	register_command "perl-reload" => sub {
1251	my ($who, $arg) = @_;	1537	my ($who, $arg) = @_;
1252		1538
1253	if ($who->flag (FLAG_WIZ)) {	1539	if ($who->flag (FLAG_WIZ)) {
		1540	$who->message ("start of reload.");
1254	_perl_reload {	1541	perl_reload;
1255	warn $_[0];	1542	$who->message ("end of reload.");
1256	$who->message ($_[0]);
1257	};
1258	}	1543	}
1259	};	1544	};
1260		1545
1261	unshift @INC, $LIBDIR;	1546	unshift @INC, $LIBDIR;
1262		1547
1263	$TICK_WATCHER = Event->timer (	1548	$TICK_WATCHER = Event->timer (
		1549	reentrant => 0,
1264	prio => 0,	1550	prio => 0,
1265	at => $NEXT_TICK \|\| 1,	1551	at => $NEXT_TICK \|\| $TICK,
1266	data => WF_AUTOCANCEL,	1552	data => WF_AUTOCANCEL,
1267	cb => sub {	1553	cb => sub {
		1554	unless ($FREEZE) {
1268	cf::server_tick; # one server iteration	1555	cf::server_tick; # one server iteration
		1556	$RUNTIME += $TICK;
		1557	}
1269		1558
1270	my $NOW = Event::time;
1271	$NEXT_TICK += $TICK;	1559	$NEXT_TICK += $TICK;
1272		1560
1273	# if we are delayed by four ticks or more, skip them all	1561	# if we are delayed by four ticks or more, skip them all
1274	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;	1562	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1275		1563
1276	$TICK_WATCHER->at ($NEXT_TICK);	1564	$TICK_WATCHER->at ($NEXT_TICK);
1277	$TICK_WATCHER->start;	1565	$TICK_WATCHER->start;
1278	},	1566	},
1279	);	1567	);
1280		1568
1281	IO::AIO::max_poll_time $TICK * 0.2;	1569	IO::AIO::max_poll_time $TICK * 0.2;
1282		1570
		1571	Event->io (
1283	Event->io (fd => IO::AIO::poll_fileno,	1572	fd => IO::AIO::poll_fileno,
1284	poll => 'r',	1573	poll => 'r',
1285	prio => 5,	1574	prio => 5,
1286	data => WF_AUTOCANCEL,	1575	data => WF_AUTOCANCEL,
1287	cb => \&IO::AIO::poll_cb);	1576	cb => \&IO::AIO::poll_cb,
		1577	);
		1578
		1579	Event->timer (
		1580	data => WF_AUTOCANCEL,
		1581	after => 0,
		1582	interval => 10,
		1583	cb => sub {
		1584	(Coro::unblock_sub {
		1585	write_runtime
		1586	or warn "ERROR: unable to write runtime file: $!";
		1587	})->();
		1588	},
		1589	);
1288		1590
1289	1	1591	1
1290		1592

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.96 by root, Fri Dec 22 06:02:29 2006 UTC vs. Revision 1.109 by root, Sun Dec 31 22:23:12 2006 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.96 by root, Fri Dec 22 06:02:29 2006 UTC vs.
Revision 1.109 by root, Sun Dec 31 22:23:12 2006 UTC