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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.141 by root, Fri Jan 5 20:08:53 2007 UTC vs.
Revision 1.164 by root, Thu Jan 11 01:24:25 2007 UTC

…		…
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	use Coro::AIO;	18	use Coro::AIO;
19		19
		20	use Data::Dumper;
20	use Digest::MD5;	21	use Digest::MD5;
21	use Fcntl;	22	use Fcntl;
22	use IO::AIO 2.31 ();	23	use IO::AIO 2.32 ();
23	use YAML::Syck ();	24	use YAML::Syck ();
24	use Time::HiRes;	25	use Time::HiRes;
25		26
26	use Event; $Event::Eval = 1; # no idea why this is required, but it is	27	use Event; $Event::Eval = 1; # no idea why this is required, but it is
27		28
		29	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		30
28	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	31	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29	$YAML::Syck::ImplicitUnicode = 1;	32	$YAML::Syck::ImplicitUnicode = 1;
30		33
31	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	34	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32		35
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35	our %COMMAND = ();	36	our %COMMAND = ();
36	our %COMMAND_TIME = ();	37	our %COMMAND_TIME = ();
		38
		39	our @EXTS = (); # list of extension package names
37	our %EXTCMD = ();	40	our %EXTCMD = ();
		41	our %EXT_CORO = (); # coroutines bound to extensions
		42	our %EXT_MAP = (); # pluggable maps
38		43
39	our @EVENT;	44	our @EVENT;
40	our $LIBDIR = datadir . "/ext";	45	our $LIBDIR = datadir . "/ext";
41		46
42	our $TICK = MAX_TIME * 1e-6;	47	our $TICK = MAX_TIME * 1e-6;
…		…
47	our %CFG;	52	our %CFG;
48		53
49	our $UPTIME; $UPTIME \|\|= time;	54	our $UPTIME; $UPTIME \|\|= time;
50	our $RUNTIME;	55	our $RUNTIME;
51		56
		57	our %PLAYER; # all users
52	our %MAP; # all maps	58	our %MAP; # all maps
53	our $LINK_MAP; # the special {link} map	59	our $LINK_MAP; # the special {link} map
54	our $RANDOM_MAPS = cf::localdir . "/random";	60	our $RANDOM_MAPS = cf::localdir . "/random";
55	our %EXT_CORO;	61
		62	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
		63	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
56		64
57	binmode STDOUT;	65	binmode STDOUT;
58	binmode STDERR;	66	binmode STDERR;
59		67
60	# read virtual server time, if available	68	# read virtual server time, if available
…		…
105	=item %cf::CFG	113	=item %cf::CFG
106		114
107	Configuration for the server, loaded from C</etc/crossfire/config>, or	115	Configuration for the server, loaded from C</etc/crossfire/config>, or
108	from wherever your confdir points to.	116	from wherever your confdir points to.
109		117
		118	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
		119
		120	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
		121	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
		122	processing has been done. Call C<< ->wait >> on them to maximise the
		123	window of cpu time available, or simply to synchronise to the server tick.
		124
110	=back	125	=back
111		126
112	=cut	127	=cut
113		128
114	BEGIN {	129	BEGIN {
…		…
117	utf8::encode $msg;	132	utf8::encode $msg;
118		133
119	$msg .= "\n"	134	$msg .= "\n"
120	unless $msg =~ /\n$/;	135	unless $msg =~ /\n$/;
121		136
122	LOG llevError, "cfperl: $msg";	137	LOG llevError, $msg;
123	};	138	};
124	}	139	}
125		140
126	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	141	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	142	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
145		160
146	$Event::DIED = sub {	161	$Event::DIED = sub {
147	warn "error in event callback: @_";	162	warn "error in event callback: @_";
148	};	163	};
149		164
150	my %ext_pkg;
151	my @exts;
152	my @hook;
153
154	=head2 UTILITY FUNCTIONS	165	=head2 UTILITY FUNCTIONS
155		166
156	=over 4	167	=over 4
157		168
		169	=item dumpval $ref
		170
158	=cut	171	=cut
		172
		173	sub dumpval {
		174	eval {
		175	local $SIG{__DIE__};
		176	my $d;
		177	if (1) {
		178	$d = new Data::Dumper([$_[0]], ["*var"]);
		179	$d->Terse(1);
		180	$d->Indent(2);
		181	$d->Quotekeys(0);
		182	$d->Useqq(1);
		183	#$d->Bless(...);
		184	$d->Seen($_[1]) if @_ > 1;
		185	$d = $d->Dump();
		186	}
		187	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
		188	$d
		189	} \|\| "[unable to dump $_[0]: '$@']";
		190	}
159		191
160	use JSON::Syck (); # TODO# replace by JSON::PC once working	192	use JSON::Syck (); # TODO# replace by JSON::PC once working
161		193
162	=item $ref = cf::from_json $json	194	=item $ref = cf::from_json $json
163		195
…		…
286	}	318	}
287	}	319	}
288		320
289	=item $coro = cf::async_ext { BLOCK }	321	=item $coro = cf::async_ext { BLOCK }
290		322
291	Like async, but this coro is automcatially being canceled when the	323	Like async, but this coro is automatically being canceled when the
292	extension calling this is being unloaded.	324	extension calling this is being unloaded.
293		325
294	=cut	326	=cut
295		327
296	sub async_ext(&) {	328	sub async_ext(&) {
…		…
334		366
335	#############################################################################	367	#############################################################################
336		368
337	package cf::path;	369	package cf::path;
338		370
		371	use overload
		372	'""' => \&as_string;
		373
		374	# used to convert map paths into valid unix filenames by repalcing / by ∕
		375	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
		376
		377	sub register {
		378	my ($pkg, $prefix) = @_;
		379
		380	$EXT_MAP{$prefix} = $pkg;
		381	}
		382
339	sub new {	383	sub new {
340	my ($class, $path, $base) = @_;	384	my ($class, $path, $base) = @_;
341		385
342	$path = $path->as_string if ref $path;	386	return $path if ref $path;
343		387
344	my $self = bless { }, $class;	388	my $self = {};
345		389
346	# {... are special paths that are not touched	390	# {... are special paths that are not being touched
347	# ?xxx/... are special absolute paths	391	# ?xxx/... are special absolute paths
348	# ?random/... random maps	392	# ?random/... random maps
349	# /! non-realised random map exit	393	# /! non-realised random map exit
350	# /... normal maps	394	# /... normal maps
351	# ~/... per-player maps without a specific player (DO NOT USE)	395	# ~/... per-player maps without a specific player (DO NOT USE)
352	# ~user/... per-player map of a specific user	396	# ~user/... per-player map of a specific user
353		397
		398	$path =~ s/$PATH_SEP/\//go;
		399
354	if ($path =~ /^{/) {	400	if ($path =~ /^{/) {
355	# fine as it is	401	# fine as it is
356	} elsif ($path =~ s{^\?random/}{}) {
357	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
358	$self->{random} = cf::from_json $data;
359	} else {	402	} else {
360	if ($path =~ s{^~([^/]+)?}{}) {	403	if ($path =~ s{^~([^/]+)?}{}) {
		404	# ~user
361	$self->{user_rel} = 1;	405	$self->{user_rel} = 1;
362		406
363	if (defined $1) {	407	if (defined $1) {
364	$self->{user} = $1;	408	$self->{user} = $1;
365	} elsif ($base =~ m{^~([^/]+)/}) {	409	} elsif ($base =~ m{^~([^/]+)/}) {
366	$self->{user} = $1;	410	$self->{user} = $1;
367	} else {	411	} else {
368	warn "cannot resolve user-relative path without user <$path,$base>\n";	412	warn "cannot resolve user-relative path without user <$path,$base>\n";
369	}	413	}
		414	} elsif ($path =~ s{^\?([^/]+)/}{}) {
		415	# ?...
		416	$self->{ext} = $1;
		417	if (my $ext = $EXT_MAP{$1}) {
		418	bless $self, $ext;
		419	}
370	} elsif ($path =~ /^\//) {	420	} elsif ($path =~ /^\//) {
		421	# /...
371	# already absolute	422	# already absolute
372	} else {	423	} else {
		424	# relative
373	$base =~ s{[^/]+/?$}{};	425	$base =~ s{[^/]+/?$}{};
374	return $class->new ("$base/$path");	426	return $class->new ("$base/$path");
375	}	427	}
376		428
377	for ($path) {	429	for ($path) {
…		…
380	}	432	}
381	}	433	}
382		434
383	$self->{path} = $path;	435	$self->{path} = $path;
384		436
		437	if ("HASH" eq ref $self) {
		438	bless $self, $class;
		439	} else {
		440	$self->init;
		441	}
		442
		443	for my $ext (values %EXT_MAP) {
		444	if (my $subst = $ext->substitute ($self)) {
		445	return $subst;
		446	}
		447	}
		448
385	$self	449	$self
		450	}
		451
		452	sub init {
		453	# nop
		454	}
		455
		456	sub substitute {
		457	()
386	}	458	}
387		459
388	# the name / primary key / in-game path	460	# the name / primary key / in-game path
389	sub as_string {	461	sub as_string {
390	my ($self) = @_;	462	my ($self) = @_;
391		463
392	$self->{user_rel} ? "~$self->{user}$self->{path}"	464	$self->{user_rel} ? "~$self->{user}$self->{path}"
393	: $self->{random} ? "?random/$self->{path}"	465	: $self->{ext} ? "?$self->{ext}/$self->{path}"
394	: $self->{path}	466	: $self->{path}
395	}	467	}
396		468
397	# the displayed name, this is a one way mapping	469	# the displayed name, this is a one way mapping
398	sub visible_name {	470	sub visible_name {
399	my ($self) = @_;	471	&as_string
400
401	# if (my $rmp = $self->{random}) {
402	# # todo: be more intelligent about this
403	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
404	# } else {
405	$self->as_string
406	# }
407	}	472	}
408		473
409	# escape the /'s in the path	474	# escape the /'s in the path
410	sub _escaped_path {	475	sub _escaped_path {
411	# ∕ is U+2215
412	(my $path = $_[0]{path}) =~ s/\//∕/g;	476	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		477
413	$path	478	$path
414	}	479	}
415		480
416	# the original (read-only) location	481	# the original (read-only) location
417	sub load_path {	482	sub load_path {
…		…
422		487
423	# the temporary/swap location	488	# the temporary/swap location
424	sub save_path {	489	sub save_path {
425	my ($self) = @_;	490	my ($self) = @_;
426		491
		492	$self->{user_rel}
427	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path	493	? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
428	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
429	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path	494	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
430	}	495	}
431		496
432	# the unique path, might be eq to save_path	497	# the unique path, undef == no special unique path
433	sub uniq_path {	498	sub uniq_path {
434	my ($self) = @_;	499	my ($self) = @_;
435		500
436	$self->{user_rel} \|\| $self->{random}
437	? undef
438	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path	501	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
439	}
440
441	# return random map parameters, or undef
442	sub random_map_params {
443	my ($self) = @_;
444
445	$self->{random}
446	}	502	}
447		503
448	# this is somewhat ugly, but style maps do need special treatment	504	# this is somewhat ugly, but style maps do need special treatment
449	sub is_style_map {	505	sub is_style_map {
450	$_[0]{path} =~ m{^/styles/}	506	$_[0]{path} =~ m{^/styles/}
		507	}
		508
		509	sub load_orig {
		510	my ($self) = @_;
		511
		512	&cf::map::load_map_header ($self->load_path)
		513	}
		514
		515	sub load_temp {
		516	my ($self) = @_;
		517
		518	&cf::map::load_map_header ($self->save_path)
		519	}
		520
		521	sub unlink_save {
		522	my ($self) = @_;
		523
		524	utf8::encode (my $save = $self->save_path);
		525	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
		526	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
451	}	527	}
452		528
453	package cf;	529	package cf;
454		530
455	#############################################################################	531	#############################################################################
…		…
905	=cut	981	=cut
906		982
907	sub register_extcmd {	983	sub register_extcmd {
908	my ($name, $cb) = @_;	984	my ($name, $cb) = @_;
909		985
910	my $caller = caller;
911	#warn "registering extcmd '$name' to '$caller'";
912
913	$EXTCMD{$name} = [$cb, $caller];	986	$EXTCMD{$name} = $cb;
914	}	987	}
915		988
916	cf::player->attach (	989	cf::player->attach (
917	on_command => sub {	990	on_command => sub {
918	my ($pl, $name, $params) = @_;	991	my ($pl, $name, $params) = @_;
…		…
931		1004
932	my $msg = eval { from_json $buf };	1005	my $msg = eval { from_json $buf };
933		1006
934	if (ref $msg) {	1007	if (ref $msg) {
935	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1008	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
936	if (my %reply = $cb->[0]->($pl, $msg)) {	1009	if (my %reply = $cb->($pl, $msg)) {
937	$pl->ext_reply ($msg->{msgid}, %reply);	1010	$pl->ext_reply ($msg->{msgid}, %reply);
938	}	1011	}
939	}	1012	}
940	} else {	1013	} else {
941	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1014	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
943		1016
944	cf::override;	1017	cf::override;
945	},	1018	},
946	);	1019	);
947		1020
948	sub register {
949	my ($base, $pkg) = @_;
950
951	#TODO
952	}
953
954	sub load_extension {	1021	sub load_extension {
955	my ($path) = @_;	1022	my ($path) = @_;
956		1023
957	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	1024	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
958	my $base = $1;	1025	my $base = $1;
959	my $pkg = $1;	1026	my $pkg = $1;
960	$pkg =~ s/[^[:word:]]/_/g;	1027	$pkg =~ s/[^[:word:]]/_/g;
961	$pkg = "ext::$pkg";	1028	$pkg = "ext::$pkg";
962		1029
963	warn "loading '$path' into '$pkg'\n";	1030	warn "... loading '$path' into '$pkg'\n";
964		1031
965	open my $fh, "<:utf8", $path	1032	open my $fh, "<:utf8", $path
966	or die "$path: $!";	1033	or die "$path: $!";
967		1034
968	my $source =	1035	my $source =
…		…
973		1040
974	eval $source	1041	eval $source
975	or die $@ ? "$path: $@\n"	1042	or die $@ ? "$path: $@\n"
976	: "extension disabled.\n";	1043	: "extension disabled.\n";
977		1044
978	push @exts, $pkg;	1045	push @EXTS, $pkg;
979	$ext_pkg{$base} = $pkg;
980
981	# no strict 'refs';
982	# @{"$pkg\::ISA"} = ext::;
983
984	register $base, $pkg;
985	}
986
987	sub unload_extension {
988	my ($pkg) = @_;
989
990	warn "removing extension $pkg\n";
991
992	# remove hooks
993	#TODO
994	# for my $idx (0 .. $#PLUGIN_EVENT) {
995	# delete $hook[$idx]{$pkg};
996	# }
997
998	# remove commands
999	for my $name (keys %COMMAND) {
1000	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1001
1002	if (@cb) {
1003	$COMMAND{$name} = \@cb;
1004	} else {
1005	delete $COMMAND{$name};
1006	}
1007	}
1008
1009	# remove extcmds
1010	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1011	delete $EXTCMD{$name};
1012	}
1013
1014	if (my $cb = $pkg->can ("unload")) {
1015	eval {
1016	$cb->($pkg);
1017	1
1018	} or warn "$pkg unloaded, but with errors: $@";
1019	}
1020
1021	Symbol::delete_package $pkg;
1022	}	1046	}
1023		1047
1024	sub load_extensions {	1048	sub load_extensions {
1025	for my $ext (<$LIBDIR/*.ext>) {	1049	for my $ext (<$LIBDIR/*.ext>) {
1026	next unless -r $ext;	1050	next unless -r $ext;
…		…
1044	};	1068	};
1045		1069
1046	cf::map->attach (prio => -10000, package => cf::mapsupport::);	1070	cf::map->attach (prio => -10000, package => cf::mapsupport::);
1047		1071
1048	#############################################################################	1072	#############################################################################
1049	# load/save perl data associated with player->ob objects
1050
1051	sub all_objects(@) {
1052	@_, map all_objects ($_->inv), @_
1053	}
1054
1055	# TODO: compatibility cruft, remove when no longer needed
1056	cf::player->attach (
1057	on_load => sub {
1058	my ($pl, $path) = @_;
1059
1060	for my $o (all_objects $pl->ob) {
1061	if (my $value = $o->get_ob_key_value ("_perl_data")) {
1062	$o->set_ob_key_value ("_perl_data");
1063
1064	%$o = %{ Storable::thaw pack "H*", $value };
1065	}
1066	}
1067	},
1068	);
1069
1070	#############################################################################
1071		1073
1072	=head2 CORE EXTENSIONS	1074	=head2 CORE EXTENSIONS
1073		1075
1074	Functions and methods that extend core crossfire objects.	1076	Functions and methods that extend core crossfire objects.
1075		1077
		1078	=cut
		1079
		1080	package cf::player;
		1081
		1082	use Coro::AIO;
		1083
1076	=head3 cf::player	1084	=head3 cf::player
1077		1085
1078	=over 4	1086	=over 4
1079		1087
1080	=item cf::player::exists $login	1088	=item cf::player::find $login
1081		1089
1082	Returns true when the given account exists.	1090	Returns the given player object, loading it if necessary (might block).
1083		1091
1084	=cut	1092	=cut
1085		1093
1086	sub cf::player::exists($) {	1094	sub playerdir($) {
1087	cf::player::find $_[0]	1095	cf::localdir
1088	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	1096	. "/"
		1097	. cf::playerdir
		1098	. "/"
		1099	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		1100	}
		1101
		1102	sub path($) {
		1103	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		1104
		1105	(playerdir $login) . "/$login.pl"
		1106	}
		1107
		1108	sub find_active($) {
		1109	$cf::PLAYER{$_[0]}
		1110	and $cf::PLAYER{$_[0]}->active
		1111	and $cf::PLAYER{$_[0]}
		1112	}
		1113
		1114	sub exists($) {
		1115	my ($login) = @_;
		1116
		1117	$cf::PLAYER{$login}
		1118	or cf::sync_job { !aio_stat $login }
		1119	}
		1120
		1121	sub find($) {
		1122	return $cf::PLAYER{$_[0]} \|\| do {
		1123	my $login = $_[0];
		1124
		1125	my $guard = cf::lock_acquire "user_find:$login";
		1126
		1127	$cf::PLAYER{$_[0]} \|\| do {
		1128	my $pl = load_pl path $login
		1129	or return;
		1130	$cf::PLAYER{$login} = $pl
		1131	}
		1132	}
		1133	}
		1134
		1135	sub save($) {
		1136	my ($pl) = @_;
		1137
		1138	return if $pl->{deny_save};
		1139
		1140	my $path = path $pl;
		1141	my $guard = cf::lock_acquire "user_save:$path";
		1142
		1143	return if $pl->{deny_save};
		1144
		1145	aio_mkdir playerdir $pl, 0770;
		1146	$pl->{last_save} = $cf::RUNTIME;
		1147
		1148	$pl->save_pl ($path);
		1149	Coro::cede;
		1150	}
		1151
		1152	sub new($) {
		1153	my ($login) = @_;
		1154
		1155	my $self = create;
		1156
		1157	$self->ob->name ($login);
		1158	$self->{deny_save} = 1;
		1159
		1160	$cf::PLAYER{$login} = $self;
		1161
		1162	$self
		1163	}
		1164
		1165	=item $pl->quit_character
		1166
		1167	Nukes the player without looking back. If logged in, the connection will
		1168	be destroyed. May block for a long time.
		1169
		1170	=cut
		1171
		1172	sub quit_character {
		1173	my ($pl) = @_;
		1174
		1175	$pl->{deny_save} = 1;
		1176	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1177
		1178	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1179	$pl->deactivate;
		1180	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1181	$pl->ns->destroy if $pl->ns;
		1182
		1183	my $path = playerdir $pl;
		1184	my $temp = "$path~$cf::RUNTIME~deleting~";
		1185	aio_rename $path, $temp;
		1186	delete $cf::PLAYER{$pl->ob->name};
		1187	$pl->destroy;
		1188	IO::AIO::aio_rmtree $temp;
		1189	}
		1190
		1191	=item cf::player::list_logins
		1192
		1193	Returns am arrayref of all valid playernames in the system, can take a
		1194	while and may block, so not sync_job-capable, ever.
		1195
		1196	=cut
		1197
		1198	sub list_logins {
		1199	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
		1200	or return [];
		1201
		1202	my @logins;
		1203
		1204	for my $login (@$dirs) {
		1205	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
		1206	aio_read $fh, 0, 512, my $buf, 0 or next;
		1207	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1208
		1209	utf8::decode $login;
		1210	push @logins, $login;
		1211	}
		1212
		1213	\@logins
		1214	}
		1215
		1216	=item $player->maps
		1217
		1218	Returns an arrayref of cf::path's of all maps that are private for this
		1219	player. May block.
		1220
		1221	=cut
		1222
		1223	sub maps($) {
		1224	my ($pl) = @_;
		1225
		1226	my $files = aio_readdir playerdir $pl
		1227	or return;
		1228
		1229	my @paths;
		1230
		1231	for (@$files) {
		1232	utf8::decode $_;
		1233	next if /\.(?:pl\|pst)$/;
		1234	next unless /^$PATH_SEP/o;
		1235
		1236	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
		1237	}
		1238
		1239	\@paths
1089	}	1240	}
1090		1241
1091	=item $player->ext_reply ($msgid, $msgtype, %msg)	1242	=item $player->ext_reply ($msgid, $msgtype, %msg)
1092		1243
1093	Sends an ext reply to the player.	1244	Sends an ext reply to the player.
1094		1245
1095	=cut	1246	=cut
1096		1247
1097	sub cf::player::ext_reply($$$%) {	1248	sub ext_reply($$$%) {
1098	my ($self, $id, %msg) = @_;	1249	my ($self, $id, %msg) = @_;
1099		1250
1100	$msg{msgid} = $id;	1251	$msg{msgid} = $id;
1101		1252
1102	$self->send ("ext " . to_json \%msg);	1253	$self->send ("ext " . cf::to_json \%msg);
1103	}	1254	}
		1255
		1256	package cf;
1104		1257
1105	=back	1258	=back
1106		1259
1107		1260
1108	=head3 cf::map	1261	=head3 cf::map
…		…
1121		1274
1122	sub generate_random_map {	1275	sub generate_random_map {
1123	my ($path, $rmp) = @_;	1276	my ($path, $rmp) = @_;
1124		1277
1125	# mit "rum" bekleckern, nicht	1278	# mit "rum" bekleckern, nicht
1126	cf::map::_create_random_map	1279	cf::map::_create_random_map (
1127	$path,	1280	$path,
1128	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1281	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1282	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1283	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1131	$rmp->{exit_on_final_map},	1284	$rmp->{exit_on_final_map},
…		…
1133	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1286	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1134	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1287	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1135	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},	1288	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1136	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},	1289	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1137	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1290	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138	(cf::region::find $rmp->{region})	1291	(cf::region::find $rmp->{region}), $rmp->{custom}
		1292	)
1139	}	1293	}
1140		1294
1141	# and all this just because we cannot iterate over	1295	# and all this just because we cannot iterate over
1142	# all maps in C++...	1296	# all maps in C++...
1143	sub change_all_map_light {	1297	sub change_all_map_light {
…		…
1145		1299
1146	$_->change_map_light ($change)	1300	$_->change_map_light ($change)
1147	for grep $_->outdoor, values %cf::MAP;	1301	for grep $_->outdoor, values %cf::MAP;
1148	}	1302	}
1149		1303
1150	sub try_load_header($) {	1304	sub load_map_header($) {
1151	my ($path) = @_;	1305	my ($path) = @_;
1152		1306
1153	utf8::encode $path;	1307	utf8::encode $path;
1154	aio_open $path, O_RDONLY, 0	1308	aio_open $path, O_RDONLY, 0
1155	or return;	1309	or return;
1156		1310
1157	my $map = cf::map::new	1311	my $map = cf::map::new
1158	or return;	1312	or return;
1159		1313
1160	# for better error messages only, will be overwritten	1314	# for better error messages only, will be overwritten later
1161	$map->path ($path);	1315	$map->path ($path);
1162		1316
1163	$map->load_header ($path)	1317	$map->load_header ($path)
1164	or return;	1318	or return;
1165		1319
…		…
1181		1335
1182	$cf::MAP{$key} \|\| do {	1336	$cf::MAP{$key} \|\| do {
1183	my $guard = cf::lock_acquire "map_find:$key";	1337	my $guard = cf::lock_acquire "map_find:$key";
1184		1338
1185	# do it the slow way	1339	# do it the slow way
1186	my $map = try_load_header $path->save_path;	1340	my $map = $path->load_temp;
1187		1341
1188	Coro::cede;	1342	Coro::cede;
1189		1343
1190	if ($map) {	1344	if ($map) {
1191	$map->last_access ((delete $map->{last_access})	1345	$map->last_access ((delete $map->{last_access})
1192	\|\| $cf::RUNTIME); #d#	1346	\|\| $cf::RUNTIME); #d#
1193	# safety	1347	# safety
1194	$map->{instantiate_time} = $cf::RUNTIME	1348	$map->{instantiate_time} = $cf::RUNTIME
1195	if $map->{instantiate_time} > $cf::RUNTIME;	1349	if $map->{instantiate_time} > $cf::RUNTIME;
1196	} else {	1350	} else {
1197	if (my $rmp = $path->random_map_params) {	1351	$map = $path->load_orig
1198	$map = generate_random_map $key, $rmp;
1199	} else {
1200	$map = try_load_header $path->load_path;
1201	}
1202
1203	$map or return;	1352	or return;
1204		1353
1205	$map->{load_original} = 1;	1354	$map->{load_original} = 1;
1206	$map->{instantiate_time} = $cf::RUNTIME;	1355	$map->{instantiate_time} = $cf::RUNTIME;
1207	$map->last_access ($cf::RUNTIME);	1356	$map->last_access ($cf::RUNTIME);
1208	$map->instantiate;	1357	$map->instantiate;
…		…
1260		1409
1261	if ($self->{path}->is_style_map) {	1410	if ($self->{path}->is_style_map) {
1262	$self->{deny_save} = 1;	1411	$self->{deny_save} = 1;
1263	$self->{deny_reset} = 1;	1412	$self->{deny_reset} = 1;
1264	} else {	1413	} else {
		1414	$self->decay_objects;
1265	$self->fix_auto_apply;	1415	$self->fix_auto_apply;
1266	$self->decay_objects;
1267	$self->update_buttons;	1416	$self->update_buttons;
1268	$self->set_darkness_map;	1417	$self->set_darkness_map;
1269	$self->difficulty ($self->estimate_difficulty)	1418	$self->difficulty ($self->estimate_difficulty)
1270	unless $self->difficulty;	1419	unless $self->difficulty;
1271	$self->activate;	1420	$self->activate;
…		…
1274	Coro::cede;	1423	Coro::cede;
1275		1424
1276	$self->in_memory (cf::MAP_IN_MEMORY);	1425	$self->in_memory (cf::MAP_IN_MEMORY);
1277	}	1426	}
1278		1427
		1428	# find and load all maps in the 3x3 area around a map
		1429	sub load_diag {
		1430	my ($map) = @_;
		1431
		1432	my @diag; # diagonal neighbours
		1433
		1434	for (0 .. 3) {
		1435	my $neigh = $map->tile_path ($_)
		1436	or next;
		1437	$neigh = find $neigh, $map
		1438	or next;
		1439	$neigh->load;
		1440
		1441	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
		1442	[$neigh->tile_path (($_ + 1) % 4), $neigh];
		1443	}
		1444
		1445	for (@diag) {
		1446	my $neigh = find @$_
		1447	or next;
		1448	$neigh->load;
		1449	}
		1450	}
		1451
1279	sub find_sync {	1452	sub find_sync {
1280	my ($path, $origin) = @_;	1453	my ($path, $origin) = @_;
1281		1454
1282	cf::sync_job { cf::map::find $path, $origin }	1455	cf::sync_job { find $path, $origin }
1283	}	1456	}
1284		1457
1285	sub do_load_sync {	1458	sub do_load_sync {
1286	my ($map) = @_;	1459	my ($map) = @_;
1287		1460
1288	cf::sync_job { $map->load };	1461	cf::sync_job { $map->load };
1289	}	1462	}
1290		1463
		1464	our %MAP_PREFETCH;
		1465	our $MAP_PREFETCHER = Coro::async {
		1466	while () {
		1467	while (%MAP_PREFETCH) {
		1468	my $key = each %MAP_PREFETCH
		1469	or next;
		1470	my $path = delete $MAP_PREFETCH{$key};
		1471
		1472	my $map = find $path
		1473	or next;
		1474	$map->load;
		1475	}
		1476	Coro::schedule;
		1477	}
		1478	};
		1479
		1480	sub find_async {
		1481	my ($path, $origin) = @_;
		1482
		1483	$path = new cf::path $path, $origin && $origin->path;
		1484	my $key = $path->as_string;
		1485
		1486	if (my $map = $cf::MAP{$key}) {
		1487	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
		1488	}
		1489
		1490	$MAP_PREFETCH{$key} = $path;
		1491	$MAP_PREFETCHER->ready;
		1492
		1493	()
		1494	}
		1495
1291	sub save {	1496	sub save {
1292	my ($self) = @_;	1497	my ($self) = @_;
1293		1498
1294	my $lock = cf::lock_acquire "map_data:" . $self->path;	1499	my $lock = cf::lock_acquire "map_data:" . $self->path;
1295		1500
…		…
1303	$self->{load_path} = $save;	1508	$self->{load_path} = $save;
1304		1509
1305	return if $self->{deny_save};	1510	return if $self->{deny_save};
1306		1511
1307	local $self->{last_access} = $self->last_access;#d#	1512	local $self->{last_access} = $self->last_access;#d#
		1513
		1514	cf::async {
		1515	$_->contr->save for $self->players;
		1516	};
1308		1517
1309	if ($uniq) {	1518	if ($uniq) {
1310	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	1519	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
1311	$self->save_objects ($uniq, cf::IO_UNIQUES);	1520	$self->save_objects ($uniq, cf::IO_UNIQUES);
1312	} else {	1521	} else {
…		…
1347	my ($self) = @_;	1556	my ($self) = @_;
1348		1557
1349	$self->reset_at <= $cf::RUNTIME	1558	$self->reset_at <= $cf::RUNTIME
1350	}	1559	}
1351		1560
1352	sub unlink_save {
1353	my ($self) = @_;
1354
1355	utf8::encode (my $save = $self->{path}->save_path);
1356	aioreq_pri 3; IO::AIO::aio_unlink $save;
1357	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1358	}
1359
1360	sub rename {	1561	sub rename {
1361	my ($self, $new_path) = @_;	1562	my ($self, $new_path) = @_;
1362		1563
1363	$self->unlink_save;	1564	$self->{path}->unlink_save;
1364		1565
1365	delete $cf::MAP{$self->path};	1566	delete $cf::MAP{$self->path};
1366	$self->{path} = new cf::path $new_path;	1567	$self->{path} = new cf::path $new_path;
1367	$self->path ($self->{path}->as_string);	1568	$self->path ($self->{path}->as_string);
1368	$cf::MAP{$self->path} = $self;	1569	$cf::MAP{$self->path} = $self;
…		…
1382		1583
1383	delete $cf::MAP{$self->path};	1584	delete $cf::MAP{$self->path};
1384		1585
1385	$_->clear_links_to ($self) for values %cf::MAP;	1586	$_->clear_links_to ($self) for values %cf::MAP;
1386		1587
1387	$self->unlink_save;	1588	$self->{path}->unlink_save;
1388	$self->destroy;	1589	$self->destroy;
1389	}	1590	}
1390		1591
1391	my $nuke_counter = "aaaa";	1592	my $nuke_counter = "aaaa";
1392		1593
…		…
1407	}	1608	}
1408		1609
1409	$map	1610	$map
1410	}	1611	}
1411		1612
1412	sub emergency_save {	1613	=item cf::map::unique_maps
1413	my $freeze_guard = cf::freeze_mainloop;
1414		1614
1415	warn "enter emergency map save\n";	1615	Returns an arrayref of cf::path's of all shared maps that have
		1616	instantiated unique items. May block.
1416		1617
1417	cf::sync_job {	1618	=cut
1418	warn "begin emergency map save\n";	1619
1419	$_->save for values %cf::MAP;	1620	sub unique_maps() {
		1621	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1622	or return;
		1623
		1624	my @paths;
		1625
		1626	for (@$files) {
		1627	utf8::decode $_;
		1628	next if /\.pst$/;
		1629	next unless /^$PATH_SEP/o;
		1630
		1631	push @paths, new cf::path $_;
1420	};	1632	}
1421		1633
1422	warn "end emergency map save\n";	1634	\@paths
1423	}	1635	}
1424		1636
1425	package cf;	1637	package cf;
1426		1638
1427	=back	1639	=back
1428		1640
		1641	=head3 cf::object
		1642
		1643	=cut
		1644
		1645	package cf::object;
		1646
		1647	=over 4
		1648
		1649	=item $ob->inv_recursive
		1650
		1651	Returns the inventory of the object _and_ their inventories, recursively.
		1652
		1653	=cut
		1654
		1655	sub inv_recursive_;
		1656	sub inv_recursive_ {
		1657	map { $_, inv_recursive_ $_->inv } @_
		1658	}
		1659
		1660	sub inv_recursive {
		1661	inv_recursive_ inv $_[0]
		1662	}
		1663
		1664	package cf;
		1665
		1666	=back
1429		1667
1430	=head3 cf::object::player	1668	=head3 cf::object::player
1431		1669
1432	=over 4	1670	=over 4
1433		1671
…		…
1525	# use -1 or undef as default coordinates, not 0, 0	1763	# use -1 or undef as default coordinates, not 0, 0
1526	($x, $y) = ($map->enter_x, $map->enter_y)	1764	($x, $y) = ($map->enter_x, $map->enter_y)
1527	if $x <=0 && $y <= 0;	1765	if $x <=0 && $y <= 0;
1528		1766
1529	$map->load;	1767	$map->load;
		1768	$map->load_diag;
1530		1769
		1770	return unless $self->contr->active;
1531	$self->activate_recursive;	1771	$self->activate_recursive;
1532	$self->enter_map ($map, $x, $y);	1772	$self->enter_map ($map, $x, $y);
1533	}	1773	}
1534		1774
1535	cf::player->attach (	1775	cf::player->attach (
…		…
1547	my ($pl) = @_;	1787	my ($pl) = @_;
1548		1788
1549	# try to abort aborted map switching on player login :)	1789	# try to abort aborted map switching on player login :)
1550	# should happen only on crashes	1790	# should happen only on crashes
1551	if ($pl->ob->{_link_pos}) {	1791	if ($pl->ob->{_link_pos}) {
1552
1553	$pl->ob->enter_link;	1792	$pl->ob->enter_link;
1554	(async {	1793	(async {
1555	# we need this sleep as the login has a concurrent enter_exit running	1794	# we need this sleep as the login has a concurrent enter_exit running
1556	# and this sleep increases chances of the player not ending up in scorn	1795	# and this sleep increases chances of the player not ending up in scorn
1557	$pl->ob->reply (undef,	1796	$pl->ob->reply (undef,
…		…
1570	=cut	1809	=cut
1571		1810
1572	sub cf::object::player::goto {	1811	sub cf::object::player::goto {
1573	my ($self, $path, $x, $y) = @_;	1812	my ($self, $path, $x, $y) = @_;
1574		1813
		1814	$path = new cf::path $path;
		1815
1575	$self->enter_link;	1816	$self->enter_link;
1576		1817
1577	(async {	1818	(async {
1578	$path = new cf::path $path;
1579
1580	my $map = cf::map::find $path->as_string;	1819	my $map = cf::map::find $path->as_string;
1581	$map = $map->customise_for ($self) if $map;	1820	$map = $map->customise_for ($self) if $map;
1582		1821
1583	# warn "entering ", $map->path, " at ($x, $y)\n"	1822	# warn "entering ", $map->path, " at ($x, $y)\n"
1584	# if $map;	1823	# if $map;
1585		1824
1586	$map or $self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	1825	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1587		1826
1588	$self->leave_link ($map, $x, $y);	1827	$self->leave_link ($map, $x, $y);
1589	})->prio (1);	1828	})->prio (1);
1590	}	1829	}
1591		1830
…		…
1657		1896
1658	1;	1897	1;
1659	}) {	1898	}) {
1660	$self->message ("Something went wrong deep within the crossfire server. "	1899	$self->message ("Something went wrong deep within the crossfire server. "
1661	. "I'll try to bring you back to the map you were before. "	1900	. "I'll try to bring you back to the map you were before. "
1662	. "Please report this to the dungeon master",	1901	. "Please report this to the dungeon master!",
1663	cf::NDI_UNIQUE \| cf::NDI_RED);	1902	cf::NDI_UNIQUE \| cf::NDI_RED);
1664		1903
1665	warn "ERROR in enter_exit: $@";	1904	warn "ERROR in enter_exit: $@";
1666	$self->leave_link;	1905	$self->leave_link;
1667	}	1906	}
…		…
1999	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	2238	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2000	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	2239	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2001		2240
2002	if (exists $CFG{mlockall}) {	2241	if (exists $CFG{mlockall}) {
2003	eval {	2242	eval {
2004	$CFG{mlockall} ? &mlockall : &munlockall	2243	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2005	and die "WARNING: m(un)lockall failed: $!\n";	2244	and die "WARNING: m(un)lockall failed: $!\n";
2006	};	2245	};
2007	warn $@ if $@;	2246	warn $@ if $@;
2008	}	2247	}
2009	}	2248	}
…		…
2020	load_extensions;	2259	load_extensions;
2021	Event::loop;	2260	Event::loop;
2022	}	2261	}
2023		2262
2024	#############################################################################	2263	#############################################################################
2025	# initialisation	2264	# initialisation and cleanup
		2265
		2266	# install some emergency cleanup handlers
		2267	BEGIN {
		2268	for my $signal (qw(INT HUP TERM)) {
		2269	Event->signal (
		2270	data => WF_AUTOCANCEL,
		2271	signal => $signal,
		2272	cb => sub {
		2273	cf::cleanup "SIG$signal";
		2274	},
		2275	);
		2276	}
		2277	}
		2278
		2279	sub emergency_save() {
		2280	my $freeze_guard = cf::freeze_mainloop;
		2281
		2282	warn "enter emergency perl save\n";
		2283
		2284	cf::sync_job {
		2285	# use a peculiar iteration method to avoid tripping on perl
		2286	# refcount bugs in for. also avoids problems with players
		2287	# and maps saved/Destroyed asynchronously.
		2288	warn "begin emergency player save\n";
		2289	for my $login (keys %cf::PLAYER) {
		2290	my $pl = $cf::PLAYER{$login} or next;
		2291	$pl->valid or next;
		2292	$pl->save;
		2293	}
		2294	warn "end emergency player save\n";
		2295
		2296	warn "begin emergency map save\n";
		2297	for my $path (keys %cf::MAP) {
		2298	my $map = $cf::MAP{$path} or next;
		2299	$map->valid or next;
		2300	$map->save;
		2301	}
		2302	warn "end emergency map save\n";
		2303	};
		2304
		2305	warn "leave emergency perl save\n";
		2306	}
2026		2307
2027	sub reload() {	2308	sub reload() {
2028	# can/must only be called in main	2309	# can/must only be called in main
2029	if ($Coro::current != $Coro::main) {	2310	if ($Coro::current != $Coro::main) {
2030	warn "can only reload from main coroutine\n";	2311	warn "can only reload from main coroutine\n";
2031	return;	2312	return;
2032	}	2313	}
2033		2314
2034	warn "reloading...";	2315	warn "reloading...";
2035		2316
		2317	warn "freezing server";
2036	my $guard = freeze_mainloop;	2318	my $guard = freeze_mainloop;
2037	cf::emergency_save;	2319	cf::emergency_save;
2038		2320
		2321	warn "sync database to disk";
		2322	cf::db_sync;
		2323	IO::AIO::flush;
		2324
2039	eval {	2325	eval {
2040	# if anything goes wrong in here, we should simply crash as we already saved	2326	# if anything goes wrong in here, we should simply crash as we already saved
2041		2327
2042	# cancel all watchers	2328	warn "cancel all watchers";
2043	for (Event::all_watchers) {	2329	for (Event::all_watchers) {
2044	$_->cancel if $_->data & WF_AUTOCANCEL;	2330	$_->cancel if $_->data & WF_AUTOCANCEL;
2045	}	2331	}
2046		2332
2047	# cancel all extension coros	2333	warn "cancel all extension coros";
2048	$_->cancel for values %EXT_CORO;	2334	$_->cancel for values %EXT_CORO;
2049	%EXT_CORO = ();	2335	%EXT_CORO = ();
2050		2336
		2337	warn "remove commands";
		2338	%COMMAND = ();
		2339
		2340	warn "remove ext commands";
		2341	%EXTCMD = ();
		2342
2051	# unload all extensions	2343	warn "unload/nuke all extensions";
2052	for (@exts) {	2344	for my $pkg (@EXTS) {
2053	warn "unloading <$_>";	2345	warn "... unloading $pkg";
2054	unload_extension $_;	2346
		2347	if (my $cb = $pkg->can ("unload")) {
		2348	eval {
		2349	$cb->($pkg);
		2350	1
		2351	} or warn "$pkg unloaded, but with errors: $@";
2055	}	2352	}
2056		2353
		2354	warn "... nuking $pkg";
		2355	Symbol::delete_package $pkg;
		2356	}
		2357
2057	# unload all modules loaded from $LIBDIR	2358	warn "unload all perl modules loaded from $LIBDIR";
2058	while (my ($k, $v) = each %INC) {	2359	while (my ($k, $v) = each %INC) {
2059	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2360	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2060		2361
2061	warn "removing <$k>";	2362	warn "removing <$k>";
2062	delete $INC{$k};	2363	delete $INC{$k};
…		…
2069	}	2370	}
2070		2371
2071	Symbol::delete_package $k;	2372	Symbol::delete_package $k;
2072	}	2373	}
2073		2374
2074	# sync database to disk
2075	cf::db_sync;
2076	IO::AIO::flush;
2077
2078	# get rid of safe::, as good as possible	2375	warn "get rid of safe::, as good as possible";
2079	Symbol::delete_package "safe::$_"	2376	Symbol::delete_package "safe::$_"
2080	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2377	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2081		2378
2082	# remove register_script_function callbacks
2083	# TODO
2084
2085	# unload cf.pm "a bit"	2379	warn "unload cf.pm \"a bit\"";
2086	delete $INC{"cf.pm"};	2380	delete $INC{"cf.pm"};
2087		2381
2088	# don't, removes xs symbols, too,	2382	# don't, removes xs symbols, too,
2089	# and global variables created in xs	2383	# and global variables created in xs
2090	#Symbol::delete_package __PACKAGE__;	2384	#Symbol::delete_package __PACKAGE__;
2091		2385
2092	# reload cf.pm
2093	warn "reloading cf.pm";	2386	warn "reloading cf.pm";
2094	require cf;	2387	require cf;
2095	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2388	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2096		2389
2097	# load config and database again	2390	warn "load config and database again";
2098	cf::cfg_load;	2391	cf::cfg_load;
2099	cf::db_load;	2392	cf::db_load;
2100		2393
2101	# load extensions
2102	warn "load extensions";	2394	warn "load extensions";
2103	cf::load_extensions;	2395	cf::load_extensions;
2104		2396
2105	# reattach attachments to objects	2397	warn "reattach attachments to objects/players";
2106	warn "reattach";
2107	_global_reattach;	2398	_global_reattach;
		2399	warn "reattach attachments to maps";
		2400	reattach $_ for values %MAP;
2108	};	2401	};
2109		2402
2110	if ($@) {	2403	if ($@) {
2111	warn $@;	2404	warn $@;
2112	warn "error while reloading, exiting.";	2405	warn "error while reloading, exiting.";
2113	exit 1;	2406	exit 1;
2114	}	2407	}
2115		2408
2116	warn "reloaded successfully";	2409	warn "reloaded";
2117	};	2410	};
2118		2411
2119	#############################################################################	2412	#############################################################################
2120		2413
2121	unless ($LINK_MAP) {	2414	unless ($LINK_MAP) {
…		…
2128	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";	2421	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2129	$LINK_MAP->in_memory (MAP_IN_MEMORY);	2422	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2130		2423
2131	# dirty hack because... archetypes are not yet loaded	2424	# dirty hack because... archetypes are not yet loaded
2132	Event->timer (	2425	Event->timer (
2133	after => 2,	2426	after => 10,
2134	cb => sub {	2427	cb => sub {
2135	$_[0]->w->cancel;	2428	$_[0]->w->cancel;
2136		2429
2137	# provide some exits "home"	2430	# provide some exits "home"
2138	my $exit = cf::object::new "exit";	2431	my $exit = cf::object::new "exit";
…		…
2157	$LINK_MAP->{deny_reset} = 1;	2450	$LINK_MAP->{deny_reset} = 1;
2158		2451
2159	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;	2452	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2160	}	2453	}
2161		2454
2162	register "<global>", __PACKAGE__;
2163
2164	register_command "reload" => sub {	2455	register_command "reload" => sub {
2165	my ($who, $arg) = @_;	2456	my ($who, $arg) = @_;
2166		2457
2167	if ($who->flag (FLAG_WIZ)) {	2458	if ($who->flag (FLAG_WIZ)) {
2168	$who->message ("start of reload.");	2459	$who->message ("start of reload.");
…		…
2177	reentrant => 0,	2468	reentrant => 0,
2178	prio => 0,	2469	prio => 0,
2179	at => $NEXT_TICK \|\| $TICK,	2470	at => $NEXT_TICK \|\| $TICK,
2180	data => WF_AUTOCANCEL,	2471	data => WF_AUTOCANCEL,
2181	cb => sub {	2472	cb => sub {
		2473	$NOW = Event::time;
		2474
2182	cf::server_tick; # one server iteration	2475	cf::server_tick; # one server iteration
2183	$RUNTIME += $TICK;	2476	$RUNTIME += $TICK;
2184	$NEXT_TICK += $TICK;	2477	$NEXT_TICK += $TICK;
		2478
		2479	$WAIT_FOR_TICK->broadcast;
		2480	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2185		2481
2186	# if we are delayed by four ticks or more, skip them all	2482	# if we are delayed by four ticks or more, skip them all
2187	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2483	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2188		2484
2189	$TICK_WATCHER->at ($NEXT_TICK);	2485	$TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.141 by root, Fri Jan 5 20:08:53 2007 UTC vs. Revision 1.164 by root, Thu Jan 11 01:24:25 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.141 by root, Fri Jan 5 20:08:53 2007 UTC vs.
Revision 1.164 by root, Thu Jan 11 01:24:25 2007 UTC