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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.115 by root, Mon Jan 1 16:50:10 2007 UTC vs.
Revision 1.158 by root, Wed Jan 10 19:52:43 2007 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 3.3;	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	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 (2); # 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
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34		35
35	our %COMMAND = ();	36	our %COMMAND = ();
36	our %COMMAND_TIME = ();	37	our %COMMAND_TIME = ();
37	our %EXTCMD = ();	38	our %EXTCMD = ();
38		39
…		…
47	our %CFG;	48	our %CFG;
48		49
49	our $UPTIME; $UPTIME \|\|= time;	50	our $UPTIME; $UPTIME \|\|= time;
50	our $RUNTIME;	51	our $RUNTIME;
51		52
		53	our %PLAYER; # all users
52	our %MAP; # all maps	54	our %MAP; # all maps
53	our $LINK_MAP; # the special {link} map	55	our $LINK_MAP; # the special {link} map
54	our $FREEZE;
55	our $RANDOM_MAPS = cf::localdir . "/random";	56	our $RANDOM_MAPS = cf::localdir . "/random";
56	our %EXT_CORO;	57	our %EXT_CORO; # coroutines bound to extensions
		58
		59	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
		60	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
57		61
58	binmode STDOUT;	62	binmode STDOUT;
59	binmode STDERR;	63	binmode STDERR;
60		64
61	# read virtual server time, if available	65	# read virtual server time, if available
…		…
71	mkdir cf::localdir . "/" . cf::uniquedir;	75	mkdir cf::localdir . "/" . cf::uniquedir;
72	mkdir $RANDOM_MAPS;	76	mkdir $RANDOM_MAPS;
73		77
74	# a special map that is always available	78	# a special map that is always available
75	our $LINK_MAP;	79	our $LINK_MAP;
76		80	our $EMERGENCY_POSITION;
77	our $EMERGENCY_POSITION = $cf::CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
78		81
79	#############################################################################	82	#############################################################################
80		83
81	=head2 GLOBAL VARIABLES	84	=head2 GLOBAL VARIABLES
82		85
…		…
106		109
107	=item %cf::CFG	110	=item %cf::CFG
108		111
109	Configuration for the server, loaded from C</etc/crossfire/config>, or	112	Configuration for the server, loaded from C</etc/crossfire/config>, or
110	from wherever your confdir points to.	113	from wherever your confdir points to.
		114
		115	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
		116
		117	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
		118	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
		119	processing has been done. Call C<< ->wait >> on them to maximise the
		120	window of cpu time available, or simply to synchronise to the server tick.
111		121
112	=back	122	=back
113		123
114	=cut	124	=cut
115		125
…		…
119	utf8::encode $msg;	129	utf8::encode $msg;
120		130
121	$msg .= "\n"	131	$msg .= "\n"
122	unless $msg =~ /\n$/;	132	unless $msg =~ /\n$/;
123		133
124	LOG llevError, "cfperl: $msg";	134	LOG llevError, $msg;
125	};	135	};
126	}	136	}
127		137
128	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	138	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	139	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
155		165
156	=head2 UTILITY FUNCTIONS	166	=head2 UTILITY FUNCTIONS
157		167
158	=over 4	168	=over 4
159		169
		170	=item dumpval $ref
		171
160	=cut	172	=cut
		173
		174	sub dumpval {
		175	eval {
		176	local $SIG{__DIE__};
		177	my $d;
		178	if (1) {
		179	$d = new Data::Dumper([$_[0]], ["*var"]);
		180	$d->Terse(1);
		181	$d->Indent(2);
		182	$d->Quotekeys(0);
		183	$d->Useqq(1);
		184	#$d->Bless(...);
		185	$d->Seen($_[1]) if @_ > 1;
		186	$d = $d->Dump();
		187	}
		188	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
		189	$d
		190	} \|\| "[unable to dump $_[0]: '$@']";
		191	}
161		192
162	use JSON::Syck (); # TODO# replace by JSON::PC once working	193	use JSON::Syck (); # TODO# replace by JSON::PC once working
163		194
164	=item $ref = cf::from_json $json	195	=item $ref = cf::from_json $json
165		196
…		…
180		211
181	sub to_json($) {	212	sub to_json($) {
182	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	213	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183	JSON::Syck::Dump $_[0]	214	JSON::Syck::Dump $_[0]
184	}	215	}
		216
		217	=item cf::lock_wait $string
		218
		219	Wait until the given lock is available. See cf::lock_acquire.
		220
		221	=item my $lock = cf::lock_acquire $string
		222
		223	Wait until the given lock is available and then acquires it and returns
		224	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
		225	for example when the coroutine gets canceled), the lock is automatically
		226	returned.
		227
		228	Lock names should begin with a unique identifier (for example, cf::map::find
		229	uses map_find and cf::map::load uses map_load).
		230
		231	=cut
		232
		233	our %LOCK;
		234
		235	sub lock_wait($) {
		236	my ($key) = @_;
		237
		238	# wait for lock, if any
		239	while ($LOCK{$key}) {
		240	push @{ $LOCK{$key} }, $Coro::current;
		241	Coro::schedule;
		242	}
		243	}
		244
		245	sub lock_acquire($) {
		246	my ($key) = @_;
		247
		248	# wait, to be sure we are not locked
		249	lock_wait $key;
		250
		251	$LOCK{$key} = [];
		252
		253	Coro::guard {
		254	# wake up all waiters, to be on the safe side
		255	$_->ready for @{ delete $LOCK{$key} };
		256	}
		257	}
		258
		259	sub freeze_mainloop {
		260	return unless $TICK_WATCHER->is_active;
		261
		262	my $guard = Coro::guard { $TICK_WATCHER->start };
		263	$TICK_WATCHER->stop;
		264	$guard
		265	}
		266
		267	=item cf::async { BLOCK }
		268
		269	Currently the same as Coro::async_pool, meaning you cannot use
		270	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
		271	thing you are allowed to do is call C<prio> on it.
		272
		273	=cut
		274
		275	BEGIN { *async = \&Coro::async_pool }
185		276
186	=item cf::sync_job { BLOCK }	277	=item cf::sync_job { BLOCK }
187		278
188	The design of crossfire+ requires that the main coro ($Coro::main) is	279	The design of crossfire+ requires that the main coro ($Coro::main) is
189	always able to handle events or runnable, as crossfire+ is only partly	280	always able to handle events or runnable, as crossfire+ is only partly
…		…
203	# this is the main coro, too bad, we have to block	294	# this is the main coro, too bad, we have to block
204	# till the operation succeeds, freezing the server :/	295	# till the operation succeeds, freezing the server :/
205		296
206	# TODO: use suspend/resume instead	297	# TODO: use suspend/resume instead
207	# (but this is cancel-safe)	298	# (but this is cancel-safe)
208	local $FREEZE = 1;	299	my $freeze_guard = freeze_mainloop;
209		300
210	my $busy = 1;	301	my $busy = 1;
211	my @res;	302	my @res;
212		303
213	(Coro::async {	304	(async {
214	@res = eval { $job->() };	305	@res = eval { $job->() };
215	warn $@ if $@;	306	warn $@ if $@;
216	undef $busy;	307	undef $busy;
217	})->prio (Coro::PRIO_MAX);	308	})->prio (Coro::PRIO_MAX);
218		309
219	while ($busy) {	310	while ($busy) {
220	Coro::cede_notself;	311	Coro::cede or Event::one_event;
221	Event::one_event unless Coro::nready;
222	}	312	}
223		313
224	wantarray ? @res : $res[0]	314	wantarray ? @res : $res[0]
225	} else {	315	} else {
226	# we are in another coroutine, how wonderful, everything just works	316	# we are in another coroutine, how wonderful, everything just works
227		317
228	$job->()	318	$job->()
229	}	319	}
230	}	320	}
231		321
232	=item $coro = cf::coro { BLOCK }	322	=item $coro = cf::async_ext { BLOCK }
233		323
234	Creates and returns a new coro. This coro is automcatially being canceled	324	Like async, but this coro is automcatially being canceled when the
235	when the extension calling this is being unloaded.	325	extension calling this is being unloaded.
236		326
237	=cut	327	=cut
238		328
239	sub coro(&) {	329	sub async_ext(&) {
240	my $cb = shift;	330	my $cb = shift;
241		331
242	my $coro; $coro = async {	332	my $coro = &Coro::async ($cb);
243	eval {
244	$cb->();
245	};
246	warn $@ if $@;
247	};
248		333
249	$coro->on_destroy (sub {	334	$coro->on_destroy (sub {
250	delete $EXT_CORO{$coro+0};	335	delete $EXT_CORO{$coro+0};
251	});	336	});
252	$EXT_CORO{$coro+0} = $coro;	337	$EXT_CORO{$coro+0} = $coro;
…		…
281	=cut	366	=cut
282		367
283	#############################################################################	368	#############################################################################
284		369
285	package cf::path;	370	package cf::path;
		371
		372	use overload
		373	'""' => \&as_string;
		374
		375	# used to convert map paths into valid unix filenames by repalcing / by ∕
		376	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
286		377
287	sub new {	378	sub new {
288	my ($class, $path, $base) = @_;	379	my ($class, $path, $base) = @_;
289		380
290	$path = $path->as_string if ref $path;	381	$path = $path->as_string if ref $path;
…		…
296	# ?random/... random maps	387	# ?random/... random maps
297	# /! non-realised random map exit	388	# /! non-realised random map exit
298	# /... normal maps	389	# /... normal maps
299	# ~/... per-player maps without a specific player (DO NOT USE)	390	# ~/... per-player maps without a specific player (DO NOT USE)
300	# ~user/... per-player map of a specific user	391	# ~user/... per-player map of a specific user
		392
		393	$path =~ s/$PATH_SEP/\//go;
301		394
302	if ($path =~ /^{/) {	395	if ($path =~ /^{/) {
303	# fine as it is	396	# fine as it is
304	} elsif ($path =~ s{^\?random/}{}) {	397	} elsif ($path =~ s{^\?random/}{}) {
305	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;	398	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
…		…
354	# }	447	# }
355	}	448	}
356		449
357	# escape the /'s in the path	450	# escape the /'s in the path
358	sub _escaped_path {	451	sub _escaped_path {
359	# ∕ is U+2215
360	(my $path = $_[0]{path}) =~ s/\//∕/g;	452	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
361	$path	453	$path
362	}	454	}
363		455
364	# the original (read-only) location	456	# the original (read-only) location
365	sub load_path {	457	sub load_path {
…		…
817	(aio_load "$filename.pst", $av) >= 0	909	(aio_load "$filename.pst", $av) >= 0
818	or return;	910	or return;
819	$av = eval { (Storable::thaw $av)->{objs} };	911	$av = eval { (Storable::thaw $av)->{objs} };
820	}	912	}
821		913
		914	warn sprintf "loading %s (%d)\n",
		915	$filename, length $data, scalar @{$av \|\| []};#d#
822	return ($data, $av);	916	return ($data, $av);
823	}	917	}
824		918
825	#############################################################################	919	#############################################################################
826	# command handling &c	920	# command handling &c
…		…
990	};	1084	};
991		1085
992	cf::map->attach (prio => -10000, package => cf::mapsupport::);	1086	cf::map->attach (prio => -10000, package => cf::mapsupport::);
993		1087
994	#############################################################################	1088	#############################################################################
995	# load/save perl data associated with player->ob objects
996
997	sub all_objects(@) {
998	@_, map all_objects ($_->inv), @_
999	}
1000
1001	# TODO: compatibility cruft, remove when no longer needed
1002	cf::player->attach (
1003	on_load => sub {
1004	my ($pl, $path) = @_;
1005
1006	for my $o (all_objects $pl->ob) {
1007	if (my $value = $o->get_ob_key_value ("_perl_data")) {
1008	$o->set_ob_key_value ("_perl_data");
1009
1010	%$o = %{ Storable::thaw pack "H*", $value };
1011	}
1012	}
1013	},
1014	);
1015
1016	#############################################################################
1017		1089
1018	=head2 CORE EXTENSIONS	1090	=head2 CORE EXTENSIONS
1019		1091
1020	Functions and methods that extend core crossfire objects.	1092	Functions and methods that extend core crossfire objects.
1021		1093
		1094	=cut
		1095
		1096	package cf::player;
		1097
		1098	use Coro::AIO;
		1099
1022	=head3 cf::player	1100	=head3 cf::player
1023		1101
1024	=over 4	1102	=over 4
1025		1103
1026	=item cf::player::exists $login	1104	=item cf::player::find $login
1027		1105
1028	Returns true when the given account exists.	1106	Returns the given player object, loading it if necessary (might block).
1029		1107
1030	=cut	1108	=cut
1031		1109
1032	sub cf::player::exists($) {	1110	sub playerdir($) {
1033	cf::player::find $_[0]	1111	cf::localdir
1034	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	1112	. "/"
		1113	. cf::playerdir
		1114	. "/"
		1115	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		1116	}
		1117
		1118	sub path($) {
		1119	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		1120
		1121	(playerdir $login) . "/$login.pl"
		1122	}
		1123
		1124	sub find_active($) {
		1125	$cf::PLAYER{$_[0]}
		1126	and $cf::PLAYER{$_[0]}->active
		1127	and $cf::PLAYER{$_[0]}
		1128	}
		1129
		1130	sub exists($) {
		1131	my ($login) = @_;
		1132
		1133	$cf::PLAYER{$login}
		1134	or cf::sync_job { !aio_stat $login }
		1135	}
		1136
		1137	sub find($) {
		1138	return $cf::PLAYER{$_[0]} \|\| do {
		1139	my $login = $_[0];
		1140
		1141	my $guard = cf::lock_acquire "user_find:$login";
		1142
		1143	$cf::PLAYER{$_[0]} \|\| do {
		1144	my $pl = load_pl path $login
		1145	or return;
		1146	$cf::PLAYER{$login} = $pl
		1147	}
		1148	}
		1149	}
		1150
		1151	sub save($) {
		1152	my ($pl) = @_;
		1153
		1154	return if $pl->{deny_save};
		1155
		1156	my $path = path $pl;
		1157	my $guard = cf::lock_acquire "user_save:$path";
		1158
		1159	return if $pl->{deny_save};
		1160
		1161	aio_mkdir playerdir $pl, 0770;
		1162	$pl->{last_save} = $cf::RUNTIME;
		1163
		1164	$pl->save_pl ($path);
		1165	Coro::cede;
		1166	}
		1167
		1168	sub new($) {
		1169	my ($login) = @_;
		1170
		1171	my $self = create;
		1172
		1173	$self->ob->name ($login);
		1174	$self->{deny_save} = 1;
		1175
		1176	$cf::PLAYER{$login} = $self;
		1177
		1178	$self
		1179	}
		1180
		1181	=item $pl->quit_character
		1182
		1183	Nukes the player without looking back. If logged in, the connection will
		1184	be destroyed. May block for a long time.
		1185
		1186	=cut
		1187
		1188	sub quit_character {
		1189	my ($pl) = @_;
		1190
		1191	$pl->{deny_save} = 1;
		1192	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1193
		1194	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1195	$pl->deactivate;
		1196	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1197	$pl->ns->destroy if $pl->ns;
		1198
		1199	my $path = playerdir $pl;
		1200	my $temp = "$path~$cf::RUNTIME~deleting~";
		1201	aio_rename $path, $temp;
		1202	delete $cf::PLAYER{$pl->ob->name};
		1203	$pl->destroy;
		1204	IO::AIO::aio_rmtree $temp;
		1205	}
		1206
		1207	=item cf::player::list_logins
		1208
		1209	Returns am arrayref of all valid playernames in the system, can take a
		1210	while and may block, so not sync_job-capable, ever.
		1211
		1212	=cut
		1213
		1214	sub list_logins {
		1215	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
		1216	or return [];
		1217
		1218	my @logins;
		1219
		1220	for my $login (@$dirs) {
		1221	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
		1222	aio_read $fh, 0, 512, my $buf, 0 or next;
		1223	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1224
		1225	utf8::decode $login;
		1226	push @logins, $login;
		1227	}
		1228
		1229	\@logins
		1230	}
		1231
		1232	=item $player->maps
		1233
		1234	Returns an arrayref of cf::path's of all maps that are private for this
		1235	player. May block.
		1236
		1237	=cut
		1238
		1239	sub maps($) {
		1240	my ($pl) = @_;
		1241
		1242	my $files = aio_readdir playerdir $pl
		1243	or return;
		1244
		1245	my @paths;
		1246
		1247	for (@$files) {
		1248	utf8::decode $_;
		1249	next if /\.(?:pl\|pst)$/;
		1250	next unless /^$PATH_SEP/o;
		1251
		1252	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
		1253	}
		1254
		1255	\@paths
1035	}	1256	}
1036		1257
1037	=item $player->ext_reply ($msgid, $msgtype, %msg)	1258	=item $player->ext_reply ($msgid, $msgtype, %msg)
1038		1259
1039	Sends an ext reply to the player.	1260	Sends an ext reply to the player.
1040		1261
1041	=cut	1262	=cut
1042		1263
1043	sub cf::player::ext_reply($$$%) {	1264	sub ext_reply($$$%) {
1044	my ($self, $id, %msg) = @_;	1265	my ($self, $id, %msg) = @_;
1045		1266
1046	$msg{msgid} = $id;	1267	$msg{msgid} = $id;
1047		1268
1048	$self->send ("ext " . to_json \%msg);	1269	$self->send ("ext " . cf::to_json \%msg);
1049	}	1270	}
		1271
		1272	package cf;
1050		1273
1051	=back	1274	=back
1052		1275
1053		1276
1054	=head3 cf::map	1277	=head3 cf::map
…		…
1060	package cf::map;	1283	package cf::map;
1061		1284
1062	use Fcntl;	1285	use Fcntl;
1063	use Coro::AIO;	1286	use Coro::AIO;
1064		1287
1065	our $MAX_RESET = 7200;	1288	our $MAX_RESET = 3600;
1066	our $DEFAULT_RESET = 3600;	1289	our $DEFAULT_RESET = 3000;
1067		1290
1068	sub generate_random_map {	1291	sub generate_random_map {
1069	my ($path, $rmp) = @_;	1292	my ($path, $rmp) = @_;
1070		1293
1071	# mit "rum" bekleckern, nicht	1294	# mit "rum" bekleckern, nicht
…		…
1087	# and all this just because we cannot iterate over	1310	# and all this just because we cannot iterate over
1088	# all maps in C++...	1311	# all maps in C++...
1089	sub change_all_map_light {	1312	sub change_all_map_light {
1090	my ($change) = @_;	1313	my ($change) = @_;
1091		1314
1092	$_->change_map_light ($change) for values %cf::MAP;	1315	$_->change_map_light ($change)
		1316	for grep $_->outdoor, values %cf::MAP;
1093	}	1317	}
1094		1318
1095	sub try_load_header($) {	1319	sub try_load_header($) {
1096	my ($path) = @_;	1320	my ($path) = @_;
1097		1321
…		…
1100	or return;	1324	or return;
1101		1325
1102	my $map = cf::map::new	1326	my $map = cf::map::new
1103	or return;	1327	or return;
1104		1328
		1329	# for better error messages only, will be overwritten
		1330	$map->path ($path);
		1331
1105	$map->load_header ($path)	1332	$map->load_header ($path)
1106	or return;	1333	or return;
1107		1334
1108	$map->{load_path} = $path;	1335	$map->{load_path} = $path;
1109		1336
1110	$map	1337	$map
1111	}	1338	}
1112		1339
		1340	sub find;
1113	sub find_map {	1341	sub find {
1114	my ($path, $origin) = @_;	1342	my ($path, $origin) = @_;
1115		1343
1116	#warn "find_map<$path,$origin>\n";#d#	1344	#warn "find<$path,$origin>\n";#d#
1117		1345
1118	$path = new cf::path $path, $origin && $origin->path;	1346	$path = new cf::path $path, $origin && $origin->path;
1119	my $key = $path->as_string;	1347	my $key = $path->as_string;
1120		1348
		1349	cf::lock_wait "map_find:$key";
		1350
1121	$cf::MAP{$key} \|\| do {	1351	$cf::MAP{$key} \|\| do {
		1352	my $guard = cf::lock_acquire "map_find:$key";
		1353
1122	# do it the slow way	1354	# do it the slow way
1123	my $map = try_load_header $path->save_path;	1355	my $map = try_load_header $path->save_path;
1124		1356
		1357	Coro::cede;
		1358
1125	if ($map) {	1359	if ($map) {
		1360	$map->last_access ((delete $map->{last_access})
		1361	\|\| $cf::RUNTIME); #d#
1126	# safety	1362	# safety
1127	$map->{instantiate_time} = $cf::RUNTIME	1363	$map->{instantiate_time} = $cf::RUNTIME
1128	if $map->{instantiate_time} > $cf::RUNTIME;	1364	if $map->{instantiate_time} > $cf::RUNTIME;
1129	} else {	1365	} else {
1130	if (my $rmp = $path->random_map_params) {	1366	if (my $rmp = $path->random_map_params) {
…		…
1135		1371
1136	$map or return;	1372	$map or return;
1137		1373
1138	$map->{load_original} = 1;	1374	$map->{load_original} = 1;
1139	$map->{instantiate_time} = $cf::RUNTIME;	1375	$map->{instantiate_time} = $cf::RUNTIME;
		1376	$map->last_access ($cf::RUNTIME);
1140	$map->instantiate;	1377	$map->instantiate;
1141		1378
1142	# per-player maps become, after loading, normal maps	1379	# per-player maps become, after loading, normal maps
1143	$map->per_player (0) if $path->{user_rel};	1380	$map->per_player (0) if $path->{user_rel};
1144	}	1381	}
1145		1382
1146	$map->path ($key);	1383	$map->path ($key);
1147	$map->{path} = $path;	1384	$map->{path} = $path;
1148	$map->last_access ($cf::RUNTIME);	1385	$map->{last_save} = $cf::RUNTIME;
		1386
		1387	Coro::cede;
1149		1388
1150	if ($map->should_reset) {	1389	if ($map->should_reset) {
1151	$map->reset;	1390	$map->reset;
		1391	undef $guard;
1152	$map = find_map $path;	1392	$map = find $path
		1393	or return;
1153	}	1394	}
1154		1395
1155	$cf::MAP{$key} = $map	1396	$cf::MAP{$key} = $map
1156	}	1397	}
1157	}	1398	}
1158		1399
1159	sub load {	1400	sub load {
1160	my ($self) = @_;	1401	my ($self) = @_;
1161		1402
		1403	my $path = $self->{path};
		1404	my $guard = cf::lock_acquire "map_load:" . $path->as_string;
		1405
1162	return if $self->in_memory != cf::MAP_SWAPPED;	1406	return if $self->in_memory != cf::MAP_SWAPPED;
1163		1407
1164	$self->in_memory (cf::MAP_LOADING);	1408	$self->in_memory (cf::MAP_LOADING);
1165
1166	my $path = $self->{path};
1167		1409
1168	$self->alloc;	1410	$self->alloc;
1169	$self->load_objects ($self->{load_path}, 1)	1411	$self->load_objects ($self->{load_path}, 1)
1170	or return;	1412	or return;
1171		1413
…		…
1177	if (aio_open $uniq, O_RDONLY, 0) {	1419	if (aio_open $uniq, O_RDONLY, 0) {
1178	$self->clear_unique_items;	1420	$self->clear_unique_items;
1179	$self->load_objects ($uniq, 0);	1421	$self->load_objects ($uniq, 0);
1180	}	1422	}
1181	}	1423	}
		1424
		1425	Coro::cede;
1182		1426
1183	# now do the right thing for maps	1427	# now do the right thing for maps
1184	$self->link_multipart_objects;	1428	$self->link_multipart_objects;
1185		1429
1186	if ($self->{path}->is_style_map) {	1430	if ($self->{path}->is_style_map) {
…		…
1194	$self->difficulty ($self->estimate_difficulty)	1438	$self->difficulty ($self->estimate_difficulty)
1195	unless $self->difficulty;	1439	unless $self->difficulty;
1196	$self->activate;	1440	$self->activate;
1197	}	1441	}
1198		1442
		1443	Coro::cede;
		1444
1199	$self->in_memory (cf::MAP_IN_MEMORY);	1445	$self->in_memory (cf::MAP_IN_MEMORY);
1200	}	1446	}
1201		1447
1202	sub load_map_sync {	1448	# find and load all maps in the 3x3 area around a map
		1449	sub load_diag {
		1450	my ($map) = @_;
		1451
		1452	my @diag; # diagonal neighbours
		1453
		1454	for (0 .. 3) {
		1455	my $neigh = $map->tile_path ($_)
		1456	or next;
		1457	$neigh = find $neigh, $map
		1458	or next;
		1459	$neigh->load;
		1460
		1461	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
		1462	[$neigh->tile_path (($_ + 1) % 4), $neigh];
		1463	}
		1464
		1465	for (@diag) {
		1466	my $neigh = find @$_
		1467	or next;
		1468	$neigh->load;
		1469	}
		1470	}
		1471
		1472	sub find_sync {
1203	my ($path, $origin) = @_;	1473	my ($path, $origin) = @_;
1204		1474
1205	#warn "load_map_sync<$path, $origin>\n";#d#	1475	cf::sync_job { find $path, $origin }
		1476	}
1206		1477
1207	cf::sync_job {	1478	sub do_load_sync {
1208	my $map = cf::map::find_map $path, $origin	1479	my ($map) = @_;
		1480
		1481	cf::sync_job { $map->load };
		1482	}
		1483
		1484	our %MAP_PREFETCH;
		1485	our $MAP_PREFETCHER = Coro::async {
		1486	while () {
		1487	while (%MAP_PREFETCH) {
		1488	my $key = each %MAP_PREFETCH
1209	or return;	1489	or next;
		1490	my $path = delete $MAP_PREFETCH{$key};
		1491
		1492	my $map = find $path
		1493	or next;
1210	$map->load;	1494	$map->load;
1211	$map	1495	}
		1496	Coro::schedule;
1212	}	1497	}
		1498	};
		1499
		1500	sub find_async {
		1501	my ($path, $origin) = @_;
		1502
		1503	$path = new cf::path $path, $origin && $origin->path;
		1504	my $key = $path->as_string;
		1505
		1506	if (my $map = $cf::MAP{$key}) {
		1507	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
		1508	}
		1509
		1510	$MAP_PREFETCH{$key} = $path;
		1511	$MAP_PREFETCHER->ready;
		1512
		1513	()
1213	}	1514	}
1214		1515
1215	sub save {	1516	sub save {
1216	my ($self) = @_;	1517	my ($self) = @_;
1217		1518
		1519	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1520
		1521	$self->{last_save} = $cf::RUNTIME;
		1522
		1523	return unless $self->dirty;
		1524
1218	my $save = $self->{path}->save_path; utf8::encode $save;	1525	my $save = $self->{path}->save_path; utf8::encode $save;
1219	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1526	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1220		1527
1221	$self->{last_save} = $cf::RUNTIME;
1222
1223	return unless $self->dirty;
1224
1225	$self->{load_path} = $save;	1528	$self->{load_path} = $save;
1226		1529
1227	return if $self->{deny_save};	1530	return if $self->{deny_save};
		1531
		1532	local $self->{last_access} = $self->last_access;#d#
		1533
		1534	cf::async {
		1535	$_->contr->save for $self->players;
		1536	};
1228		1537
1229	if ($uniq) {	1538	if ($uniq) {
1230	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	1539	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
1231	$self->save_objects ($uniq, cf::IO_UNIQUES);	1540	$self->save_objects ($uniq, cf::IO_UNIQUES);
1232	} else {	1541	} else {
…		…
1235	}	1544	}
1236		1545
1237	sub swap_out {	1546	sub swap_out {
1238	my ($self) = @_;	1547	my ($self) = @_;
1239		1548
		1549	# save first because save cedes
		1550	$self->save;
		1551
		1552	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1553
1240	return if $self->players;	1554	return if $self->players;
1241	return if $self->in_memory != cf::MAP_IN_MEMORY;	1555	return if $self->in_memory != cf::MAP_IN_MEMORY;
1242	return if $self->{deny_save};	1556	return if $self->{deny_save};
1243		1557
1244	$self->save;
1245	$self->clear;	1558	$self->clear;
1246	$self->in_memory (cf::MAP_SWAPPED);	1559	$self->in_memory (cf::MAP_SWAPPED);
1247	}	1560	}
1248		1561
1249	sub reset_at {	1562	sub reset_at {
…		…
1287	}	1600	}
1288		1601
1289	sub reset {	1602	sub reset {
1290	my ($self) = @_;	1603	my ($self) = @_;
1291		1604
		1605	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1606
1292	return if $self->players;	1607	return if $self->players;
1293	return if $self->{path}{user_rel};#d#	1608	return if $self->{path}{user_rel};#d#
1294		1609
1295	warn "resetting map ", $self->path;#d#	1610	warn "resetting map ", $self->path;#d#
1296		1611
…		…
1315		1630
1316	sub customise_for {	1631	sub customise_for {
1317	my ($map, $ob) = @_;	1632	my ($map, $ob) = @_;
1318		1633
1319	if ($map->per_player) {	1634	if ($map->per_player) {
1320	return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path};	1635	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1321	}	1636	}
1322		1637
1323	$map	1638	$map
1324	}	1639	}
1325		1640
1326	sub emergency_save {	1641	=item cf::map::unique_maps
1327	local $cf::FREEZE = 1;
1328		1642
1329	warn "enter emergency map save\n";	1643	Returns an arrayref of cf::path's of all shared maps that have
		1644	instantiated unique items. May block.
1330		1645
1331	cf::sync_job {	1646	=cut
1332	warn "begin emergency map save\n";	1647
1333	$_->save for values %cf::MAP;	1648	sub unique_maps() {
		1649	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1650	or return;
		1651
		1652	my @paths;
		1653
		1654	for (@$files) {
		1655	utf8::decode $_;
		1656	next if /\.pst$/;
		1657	next unless /^$PATH_SEP/o;
		1658
		1659	push @paths, new cf::path $_;
1334	};	1660	}
1335		1661
1336	warn "end emergency map save\n";	1662	\@paths
1337	}	1663	}
1338		1664
1339	package cf;	1665	package cf;
1340		1666
1341	=back	1667	=back
1342		1668
		1669	=head3 cf::object
		1670
		1671	=cut
		1672
		1673	package cf::object;
		1674
		1675	=over 4
		1676
		1677	=item $ob->inv_recursive
		1678
		1679	Returns the inventory of the object _and_ their inventories, recursively.
		1680
		1681	=cut
		1682
		1683	sub inv_recursive_;
		1684	sub inv_recursive_ {
		1685	map { $_, inv_recursive_ $_->inv } @_
		1686	}
		1687
		1688	sub inv_recursive {
		1689	inv_recursive_ inv $_[0]
		1690	}
		1691
		1692	package cf;
		1693
		1694	=back
1343		1695
1344	=head3 cf::object::player	1696	=head3 cf::object::player
1345		1697
1346	=over 4	1698	=over 4
1347		1699
…		…
1404	=cut	1756	=cut
1405		1757
1406	sub cf::object::player::enter_link {	1758	sub cf::object::player::enter_link {
1407	my ($self) = @_;	1759	my ($self) = @_;
1408		1760
		1761	$self->deactivate_recursive;
		1762
1409	return if $self->map == $LINK_MAP;	1763	return if $self->map == $LINK_MAP;
1410		1764
1411	$self->{_link_pos} = [$self->map->{path}, $self->x, $self->y]	1765	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1412	if $self->map;	1766	if $self->map;
1413		1767
1414	$self->enter_map ($LINK_MAP, 20, 20);	1768	$self->enter_map ($LINK_MAP, 20, 20);
1415	$self->deactivate_recursive;
1416	}	1769	}
1417		1770
1418	sub cf::object::player::leave_link {	1771	sub cf::object::player::leave_link {
1419	my ($self, $map, $x, $y) = @_;	1772	my ($self, $map, $x, $y) = @_;
1420		1773
1421	my $link_pos = delete $self->{_link_pos};	1774	my $link_pos = delete $self->{_link_pos};
1422		1775
1423	unless ($map) {	1776	unless ($map) {
1424	# restore original map position	1777	# restore original map position
1425	($map, $x, $y) = @{ $link_pos \|\| [] };	1778	($map, $x, $y) = @{ $link_pos \|\| [] };
1426	$map = cf::map::find_map $map;	1779	$map = cf::map::find $map;
1427		1780
1428	unless ($map) {	1781	unless ($map) {
1429	($map, $x, $y) = @$EMERGENCY_POSITION;	1782	($map, $x, $y) = @$EMERGENCY_POSITION;
1430	$map = cf::map::find_map $map	1783	$map = cf::map::find $map
1431	or die "FATAL: cannot load emergency map\n";	1784	or die "FATAL: cannot load emergency map\n";
1432	}	1785	}
1433	}	1786	}
1434		1787
1435	($x, $y) = (-1, -1)	1788	($x, $y) = (-1, -1)
…		…
1438	# use -1 or undef as default coordinates, not 0, 0	1791	# use -1 or undef as default coordinates, not 0, 0
1439	($x, $y) = ($map->enter_x, $map->enter_y)	1792	($x, $y) = ($map->enter_x, $map->enter_y)
1440	if $x <=0 && $y <= 0;	1793	if $x <=0 && $y <= 0;
1441		1794
1442	$map->load;	1795	$map->load;
		1796	$map->load_diag;
1443		1797
		1798	return unless $self->contr->active;
1444	$self->activate_recursive;	1799	$self->activate_recursive;
1445	$self->enter_map ($map, $x, $y);	1800	$self->enter_map ($map, $x, $y);
1446	}	1801	}
1447		1802
		1803	cf::player->attach (
		1804	on_logout => sub {
		1805	my ($pl) = @_;
		1806
		1807	# abort map switching before logout
		1808	if ($pl->ob->{_link_pos}) {
		1809	cf::sync_job {
		1810	$pl->ob->leave_link
		1811	};
		1812	}
		1813	},
		1814	on_login => sub {
		1815	my ($pl) = @_;
		1816
		1817	# try to abort aborted map switching on player login :)
		1818	# should happen only on crashes
		1819	if ($pl->ob->{_link_pos}) {
		1820	$pl->ob->enter_link;
		1821	(async {
		1822	# we need this sleep as the login has a concurrent enter_exit running
		1823	# and this sleep increases chances of the player not ending up in scorn
		1824	$pl->ob->reply (undef,
		1825	"There was an internal problem at your last logout, "
		1826	. "the server will try to bring you to your intended destination in a second.",
		1827	cf::NDI_RED);
		1828	Coro::Timer::sleep 1;
		1829	$pl->ob->leave_link;
		1830	})->prio (2);
		1831	}
		1832	},
		1833	);
		1834
1448	=item $player_object->goto_map ($map, $x, $y)	1835	=item $player_object->goto ($path, $x, $y)
1449		1836
1450	=cut	1837	=cut
1451		1838
1452	sub cf::object::player::goto_map {	1839	sub cf::object::player::goto {
1453	my ($self, $path, $x, $y) = @_;	1840	my ($self, $path, $x, $y) = @_;
1454		1841
		1842	$path = new cf::path $path;
		1843
1455	$self->enter_link;	1844	$self->enter_link;
1456		1845
1457	(Coro::async {	1846	(async {
1458	$path = new cf::path $path;
1459
1460	my $map = cf::map::find_map $path->as_string;	1847	my $map = cf::map::find $path->as_string;
1461	$map = $map->customise_for ($self) if $map;	1848	$map = $map->customise_for ($self) if $map;
1462		1849
1463	warn "entering ", $map->path, " at ($x, $y)\n"	1850	# warn "entering ", $map->path, " at ($x, $y)\n"
1464	if $map;	1851	# if $map;
1465		1852
1466	$map or $self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	1853	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1467		1854
1468	$self->leave_link ($map, $x, $y);	1855	$self->leave_link ($map, $x, $y);
1469	})->prio (1);	1856	})->prio (1);
1470	}	1857	}
1471		1858
…		…
1524		1911
1525	return unless $self->type == cf::PLAYER;	1912	return unless $self->type == cf::PLAYER;
1526		1913
1527	$self->enter_link;	1914	$self->enter_link;
1528		1915
1529	(Coro::async {	1916	(async {
		1917	$self->deactivate_recursive; # just to be sure
1530	unless (eval {	1918	unless (eval {
1531
1532	prepare_random_map $exit	1919	prepare_random_map $exit
1533	if $exit->slaying eq "/!";	1920	if $exit->slaying eq "/!";
1534		1921
1535	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;	1922	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1536	$self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);	1923	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1537		1924
1538	1;	1925	1;
1539	}) {	1926	}) {
1540	$self->message ("Something went wrong deep within the crossfire server. "	1927	$self->message ("Something went wrong deep within the crossfire server. "
1541	. "I'll try to bring you back to the map you were before. "	1928	. "I'll try to bring you back to the map you were before. "
1542	. "Please report this to the dungeon master",	1929	. "Please report this to the dungeon master!",
1543	cf::NDI_UNIQUE \| cf::NDI_RED);	1930	cf::NDI_UNIQUE \| cf::NDI_RED);
1544		1931
1545	warn "ERROR in enter_exit: $@";	1932	warn "ERROR in enter_exit: $@";
1546	$self->leave_link;	1933	$self->leave_link;
1547	}	1934	}
…		…
1598	on_reply => sub {	1985	on_reply => sub {
1599	my ($ns, $msg) = @_;	1986	my ($ns, $msg) = @_;
1600		1987
1601	# this weird shuffling is so that direct followup queries	1988	# this weird shuffling is so that direct followup queries
1602	# get handled first	1989	# get handled first
1603	my $queue = delete $ns->{query_queue};	1990	my $queue = delete $ns->{query_queue}
		1991	or return; # be conservative, not sure how that can happen, but we saw a crash here
1604		1992
1605	(shift @$queue)->[1]->($msg);	1993	(shift @$queue)->[1]->($msg);
1606		1994
1607	push @{ $ns->{query_queue} }, @$queue;	1995	push @{ $ns->{query_queue} }, @$queue;
1608		1996
…		…
1614	}	2002	}
1615	}	2003	}
1616	},	2004	},
1617	);	2005	);
1618		2006
1619	=item $client->coro (\&cb)	2007	=item $client->async (\&cb)
1620		2008
1621	Create a new coroutine, running the specified callback. The coroutine will	2009	Create a new coroutine, running the specified callback. The coroutine will
1622	be automatically cancelled when the client gets destroyed (e.g. on logout,	2010	be automatically cancelled when the client gets destroyed (e.g. on logout,
1623	or loss of connection).	2011	or loss of connection).
1624		2012
1625	=cut	2013	=cut
1626		2014
1627	sub cf::client::coro {	2015	sub cf::client::async {
1628	my ($self, $cb) = @_;	2016	my ($self, $cb) = @_;
1629		2017
1630	my $coro; $coro = async {	2018	my $coro = &Coro::async ($cb);
1631	eval {
1632	$cb->();
1633	};
1634	warn $@ if $@;
1635	};
1636		2019
1637	$coro->on_destroy (sub {	2020	$coro->on_destroy (sub {
1638	delete $self->{_coro}{$coro+0};	2021	delete $self->{_coro}{$coro+0};
1639	});	2022	});
1640		2023
…		…
1812		2195
1813	{	2196	{
1814	my $path = cf::localdir . "/database.pst";	2197	my $path = cf::localdir . "/database.pst";
1815		2198
1816	sub db_load() {	2199	sub db_load() {
1817	warn "loading database $path\n";#d# remove later
1818	$DB = stat $path ? Storable::retrieve $path : { };	2200	$DB = stat $path ? Storable::retrieve $path : { };
1819	}	2201	}
1820		2202
1821	my $pid;	2203	my $pid;
1822		2204
1823	sub db_save() {	2205	sub db_save() {
1824	warn "saving database $path\n";#d# remove later
1825	waitpid $pid, 0 if $pid;	2206	waitpid $pid, 0 if $pid;
1826	if (0 == ($pid = fork)) {	2207	if (0 == ($pid = fork)) {
1827	$DB->{_meta}{version} = 1;	2208	$DB->{_meta}{version} = 1;
1828	Storable::nstore $DB, "$path~";	2209	Storable::nstore $DB, "$path~";
1829	rename "$path~", $path;	2210	rename "$path~", $path;
…		…
1877	open my $fh, "<:utf8", cf::confdir . "/config"	2258	open my $fh, "<:utf8", cf::confdir . "/config"
1878	or return;	2259	or return;
1879		2260
1880	local $/;	2261	local $/;
1881	*CFG = YAML::Syck::Load <$fh>;	2262	*CFG = YAML::Syck::Load <$fh>;
		2263
		2264	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
		2265
		2266	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2267	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2268
		2269	if (exists $CFG{mlockall}) {
		2270	eval {
		2271	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
		2272	and die "WARNING: m(un)lockall failed: $!\n";
		2273	};
		2274	warn $@ if $@;
		2275	}
1882	}	2276	}
1883		2277
1884	sub main {	2278	sub main {
1885	# we must not ever block the main coroutine	2279	# we must not ever block the main coroutine
1886	local $Coro::idle = sub {	2280	local $Coro::idle = sub {
1887	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2281	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1888	(Coro::unblock_sub {
1889	Event::one_event;	2282	async { Event::one_event };
1890	})->();
1891	};	2283	};
1892		2284
1893	cfg_load;	2285	cfg_load;
1894	db_load;	2286	db_load;
1895	load_extensions;	2287	load_extensions;
1896	Event::loop;	2288	Event::loop;
1897	}	2289	}
1898		2290
1899	#############################################################################	2291	#############################################################################
1900	# initialisation	2292	# initialisation and cleanup
		2293
		2294	# install some emergency cleanup handlers
		2295	BEGIN {
		2296	for my $signal (qw(INT HUP TERM)) {
		2297	Event->signal (
		2298	data => WF_AUTOCANCEL,
		2299	signal => $signal,
		2300	cb => sub {
		2301	cf::cleanup "SIG$signal";
		2302	},
		2303	);
		2304	}
		2305	}
		2306
		2307	sub emergency_save() {
		2308	my $freeze_guard = cf::freeze_mainloop;
		2309
		2310	warn "enter emergency perl save\n";
		2311
		2312	cf::sync_job {
		2313	# use a peculiar iteration method to avoid tripping on perl
		2314	# refcount bugs in for. also avoids problems with players
		2315	# and maps saved/Destroyed asynchronously.
		2316	warn "begin emergency player save\n";
		2317	for my $login (keys %cf::PLAYER) {
		2318	my $pl = $cf::PLAYER{$login} or next;
		2319	$pl->valid or next;
		2320	$pl->save;
		2321	}
		2322	warn "end emergency player save\n";
		2323
		2324	warn "begin emergency map save\n";
		2325	for my $path (keys %cf::MAP) {
		2326	my $map = $cf::MAP{$path} or next;
		2327	$map->valid or next;
		2328	$map->save;
		2329	}
		2330	warn "end emergency map save\n";
		2331	};
		2332
		2333	warn "leave emergency perl save\n";
		2334	}
1901		2335
1902	sub reload() {	2336	sub reload() {
1903	# can/must only be called in main	2337	# can/must only be called in main
1904	if ($Coro::current != $Coro::main) {	2338	if ($Coro::current != $Coro::main) {
1905	warn "can only reload from main coroutine\n";	2339	warn "can only reload from main coroutine\n";
1906	return;	2340	return;
1907	}	2341	}
1908		2342
1909	warn "reloading...";	2343	warn "reloading...";
1910		2344
1911	local $FREEZE = 1;	2345	my $guard = freeze_mainloop;
1912	cf::emergency_save;	2346	cf::emergency_save;
1913		2347
1914	eval {	2348	eval {
1915	# if anything goes wrong in here, we should simply crash as we already saved	2349	# if anything goes wrong in here, we should simply crash as we already saved
1916		2350
…		…
1978	cf::load_extensions;	2412	cf::load_extensions;
1979		2413
1980	# reattach attachments to objects	2414	# reattach attachments to objects
1981	warn "reattach";	2415	warn "reattach";
1982	_global_reattach;	2416	_global_reattach;
		2417	reattach $_ for values %MAP;
1983	};	2418	};
1984		2419
1985	if ($@) {	2420	if ($@) {
1986	warn $@;	2421	warn $@;
1987	warn "error while reloading, exiting.";	2422	warn "error while reloading, exiting.";
…		…
2003	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";	2438	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2004	$LINK_MAP->in_memory (MAP_IN_MEMORY);	2439	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2005		2440
2006	# dirty hack because... archetypes are not yet loaded	2441	# dirty hack because... archetypes are not yet loaded
2007	Event->timer (	2442	Event->timer (
2008	after => 2,	2443	after => 10,
2009	cb => sub {	2444	cb => sub {
2010	$_[0]->w->cancel;	2445	$_[0]->w->cancel;
2011		2446
2012	# provide some exits "home"	2447	# provide some exits "home"
2013	my $exit = cf::object::new "exit";	2448	my $exit = cf::object::new "exit";
…		…
2052	reentrant => 0,	2487	reentrant => 0,
2053	prio => 0,	2488	prio => 0,
2054	at => $NEXT_TICK \|\| $TICK,	2489	at => $NEXT_TICK \|\| $TICK,
2055	data => WF_AUTOCANCEL,	2490	data => WF_AUTOCANCEL,
2056	cb => sub {	2491	cb => sub {
2057	unless ($FREEZE) {
2058	cf::server_tick; # one server iteration	2492	cf::server_tick; # one server iteration
2059	$RUNTIME += $TICK;	2493	$RUNTIME += $TICK;
2060	}
2061
2062	$NEXT_TICK += $TICK;	2494	$NEXT_TICK += $TICK;
		2495
		2496	$WAIT_FOR_TICK->broadcast;
		2497	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2063		2498
2064	# if we are delayed by four ticks or more, skip them all	2499	# if we are delayed by four ticks or more, skip them all
2065	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2500	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2066		2501
2067	$TICK_WATCHER->at ($NEXT_TICK);	2502	$TICK_WATCHER->at ($NEXT_TICK);
…		…
2089	or warn "ERROR: unable to write runtime file: $!";	2524	or warn "ERROR: unable to write runtime file: $!";
2090	})->();	2525	})->();
2091	},	2526	},
2092	);	2527	);
2093		2528
		2529	END { cf::emergency_save }
		2530
2094	1	2531	1
2095		2532

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.115 by root, Mon Jan 1 16:50:10 2007 UTC vs. Revision 1.158 by root, Wed Jan 10 19:52:43 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.115 by root, Mon Jan 1 16:50:10 2007 UTC vs.
Revision 1.158 by root, Wed Jan 10 19:52:43 2007 UTC