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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.111 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.154 by root, Tue Jan 9 15:36:19 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
28	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	29	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29	$YAML::Syck::ImplicitUnicode = 1;	30	$YAML::Syck::ImplicitUnicode = 1;
30		31
31	$Coro::main->prio (2); # run main coroutine ("the server") with very high priority	32	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32		33
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	34	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 = ();
…		…
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
57		58
58	binmode STDOUT;	59	binmode STDOUT;
59	binmode STDERR;	60	binmode STDERR;
60		61
61	# read virtual server time, if available	62	# read virtual server time, if available
…		…
71	mkdir cf::localdir . "/" . cf::uniquedir;	72	mkdir cf::localdir . "/" . cf::uniquedir;
72	mkdir $RANDOM_MAPS;	73	mkdir $RANDOM_MAPS;
73		74
74	# a special map that is always available	75	# a special map that is always available
75	our $LINK_MAP;	76	our $LINK_MAP;
76		77	our $EMERGENCY_POSITION;
77	our $EMERGENCY_POSITION = $cf::CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
78		78
79	#############################################################################	79	#############################################################################
80		80
81	=head2 GLOBAL VARIABLES	81	=head2 GLOBAL VARIABLES
82		82
…		…
119	utf8::encode $msg;	119	utf8::encode $msg;
120		120
121	$msg .= "\n"	121	$msg .= "\n"
122	unless $msg =~ /\n$/;	122	unless $msg =~ /\n$/;
123		123
124	LOG llevError, "cfperl: $msg";	124	LOG llevError, $msg;
125	};	125	};
126	}	126	}
127		127
128	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	128	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	129	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
155		155
156	=head2 UTILITY FUNCTIONS	156	=head2 UTILITY FUNCTIONS
157		157
158	=over 4	158	=over 4
159		159
		160	=item dumpval $ref
		161
160	=cut	162	=cut
		163
		164	sub dumpval {
		165	eval {
		166	local $SIG{__DIE__};
		167	my $d;
		168	if (1) {
		169	$d = new Data::Dumper([$_[0]], ["*var"]);
		170	$d->Terse(1);
		171	$d->Indent(2);
		172	$d->Quotekeys(0);
		173	$d->Useqq(1);
		174	#$d->Bless(...);
		175	$d->Seen($_[1]) if @_ > 1;
		176	$d = $d->Dump();
		177	}
		178	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
		179	$d
		180	} \|\| "[unable to dump $_[0]: '$@']";
		181	}
161		182
162	use JSON::Syck (); # TODO# replace by JSON::PC once working	183	use JSON::Syck (); # TODO# replace by JSON::PC once working
163		184
164	=item $ref = cf::from_json $json	185	=item $ref = cf::from_json $json
165		186
…		…
180		201
181	sub to_json($) {	202	sub to_json($) {
182	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	203	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183	JSON::Syck::Dump $_[0]	204	JSON::Syck::Dump $_[0]
184	}	205	}
		206
		207	=item cf::lock_wait $string
		208
		209	Wait until the given lock is available. See cf::lock_acquire.
		210
		211	=item my $lock = cf::lock_acquire $string
		212
		213	Wait until the given lock is available and then acquires it and returns
		214	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
		215	for example when the coroutine gets canceled), the lock is automatically
		216	returned.
		217
		218	Lock names should begin with a unique identifier (for example, cf::map::find
		219	uses map_find and cf::map::load uses map_load).
		220
		221	=cut
		222
		223	our %LOCK;
		224
		225	sub lock_wait($) {
		226	my ($key) = @_;
		227
		228	# wait for lock, if any
		229	while ($LOCK{$key}) {
		230	push @{ $LOCK{$key} }, $Coro::current;
		231	Coro::schedule;
		232	}
		233	}
		234
		235	sub lock_acquire($) {
		236	my ($key) = @_;
		237
		238	# wait, to be sure we are not locked
		239	lock_wait $key;
		240
		241	$LOCK{$key} = [];
		242
		243	Coro::guard {
		244	# wake up all waiters, to be on the safe side
		245	$_->ready for @{ delete $LOCK{$key} };
		246	}
		247	}
		248
		249	sub freeze_mainloop {
		250	return unless $TICK_WATCHER->is_active;
		251
		252	my $guard = Coro::guard { $TICK_WATCHER->start };
		253	$TICK_WATCHER->stop;
		254	$guard
		255	}
		256
		257	=item cf::async { BLOCK }
		258
		259	Currently the same as Coro::async_pool, meaning you cannot use
		260	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
		261	thing you are allowed to do is call C<prio> on it.
		262
		263	=cut
		264
		265	BEGIN { *async = \&Coro::async_pool }
185		266
186	=item cf::sync_job { BLOCK }	267	=item cf::sync_job { BLOCK }
187		268
188	The design of crossfire+ requires that the main coro ($Coro::main) is	269	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	270	always able to handle events or runnable, as crossfire+ is only partly
…		…
197	=cut	278	=cut
198		279
199	sub sync_job(&) {	280	sub sync_job(&) {
200	my ($job) = @_;	281	my ($job) = @_;
201		282
202	my $busy = 1;
203	my @res;
204
205	my $coro = Coro::async {
206	@res = eval { $job->() };
207	warn $@ if $@;
208	undef $busy;
209	};
210
211	if ($Coro::current == $Coro::main) {	283	if ($Coro::current == $Coro::main) {
		284	# this is the main coro, too bad, we have to block
		285	# till the operation succeeds, freezing the server :/
		286
212	# TODO: use suspend/resume instead	287	# TODO: use suspend/resume instead
213	local $FREEZE = 1;	288	# (but this is cancel-safe)
		289	my $freeze_guard = freeze_mainloop;
		290
		291	my $busy = 1;
		292	my @res;
		293
		294	(async {
		295	@res = eval { $job->() };
		296	warn $@ if $@;
		297	undef $busy;
214	$coro->prio (Coro::PRIO_MAX);	298	})->prio (Coro::PRIO_MAX);
		299
215	while ($busy) {	300	while ($busy) {
216	Coro::cede_notself;	301	Coro::cede or Event::one_event;
217	Event::one_event unless Coro::nready;
218	}	302	}
		303
		304	wantarray ? @res : $res[0]
219	} else {	305	} else {
220	$coro->join;	306	# we are in another coroutine, how wonderful, everything just works
		307
		308	$job->()
221	}	309	}
222
223	wantarray ? @res : $res[0]
224	}	310	}
225		311
226	=item $coro = cf::coro { BLOCK }	312	=item $coro = cf::async_ext { BLOCK }
227		313
228	Creates and returns a new coro. This coro is automcatially being canceled	314	Like async, but this coro is automcatially being canceled when the
229	when the extension calling this is being unloaded.	315	extension calling this is being unloaded.
230		316
231	=cut	317	=cut
232		318
233	sub coro(&) {	319	sub async_ext(&) {
234	my $cb = shift;	320	my $cb = shift;
235		321
236	my $coro; $coro = async {	322	my $coro = &Coro::async ($cb);
237	eval {
238	$cb->();
239	};
240	warn $@ if $@;
241	};
242		323
243	$coro->on_destroy (sub {	324	$coro->on_destroy (sub {
244	delete $EXT_CORO{$coro+0};	325	delete $EXT_CORO{$coro+0};
245	});	326	});
246	$EXT_CORO{$coro+0} = $coro;	327	$EXT_CORO{$coro+0} = $coro;
…		…
252	my $runtime = cf::localdir . "/runtime";	333	my $runtime = cf::localdir . "/runtime";
253		334
254	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	335	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
255	or return;	336	or return;
256		337
257	my $value = $cf::RUNTIME;	338	my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
258	(aio_write $fh, 0, (length $value), $value, 0) <= 0	339	(aio_write $fh, 0, (length $value), $value, 0) <= 0
259	and return;	340	and return;
260		341
261	aio_fsync $fh	342	aio_fsync $fh
262	and return;	343	and return;
…		…
276		357
277	#############################################################################	358	#############################################################################
278		359
279	package cf::path;	360	package cf::path;
280		361
		362	# used to convert map paths into valid unix filenames by repalcing / by ∕
		363	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
		364
281	sub new {	365	sub new {
282	my ($class, $path, $base) = @_;	366	my ($class, $path, $base) = @_;
283		367
284	$path = $path->as_string if ref $path;	368	$path = $path->as_string if ref $path;
285		369
286	my $self = bless { }, $class;	370	my $self = bless { }, $class;
287		371
		372	# {... are special paths that are not touched
		373	# ?xxx/... are special absolute paths
		374	# ?random/... random maps
		375	# /! non-realised random map exit
		376	# /... normal maps
		377	# ~/... per-player maps without a specific player (DO NOT USE)
		378	# ~user/... per-player map of a specific user
		379
		380	if ($path =~ /^{/) {
		381	# fine as it is
288	if ($path =~ s{^\?random/}{}) {	382	} elsif ($path =~ s{^\?random/}{}) {
289	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;	383	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290	$self->{random} = cf::from_json $data;	384	$self->{random} = cf::from_json $data;
291	} else {	385	} else {
292	if ($path =~ s{^~([^/]+)?}{}) {	386	if ($path =~ s{^~([^/]+)?}{}) {
293	$self->{user_rel} = 1;	387	$self->{user_rel} = 1;
…		…
338	# }	432	# }
339	}	433	}
340		434
341	# escape the /'s in the path	435	# escape the /'s in the path
342	sub _escaped_path {	436	sub _escaped_path {
343	# ∕ is U+2215
344	(my $path = $_[0]{path}) =~ s/\//∕/g;	437	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
345	$path	438	$path
346	}	439	}
347		440
348	# the original (read-only) location	441	# the original (read-only) location
349	sub load_path {	442	sub load_path {
…		…
798	or return;	891	or return;
799		892
800	unless (aio_stat "$filename.pst") {	893	unless (aio_stat "$filename.pst") {
801	(aio_load "$filename.pst", $av) >= 0	894	(aio_load "$filename.pst", $av) >= 0
802	or return;	895	or return;
803	$av = eval { (Storable::thaw <$av>)->{objs} };	896	$av = eval { (Storable::thaw $av)->{objs} };
804	}	897	}
805		898
		899	warn sprintf "loading %s (%d)\n",
		900	$filename, length $data, scalar @{$av \|\| []};#d#
806	return ($data, $av);	901	return ($data, $av);
807	}	902	}
808		903
809	#############################################################################	904	#############################################################################
810	# command handling &c	905	# command handling &c
…		…
1001		1096
1002	=head2 CORE EXTENSIONS	1097	=head2 CORE EXTENSIONS
1003		1098
1004	Functions and methods that extend core crossfire objects.	1099	Functions and methods that extend core crossfire objects.
1005		1100
		1101	=cut
		1102
		1103	package cf::player;
		1104
		1105	use Coro::AIO;
		1106
1006	=head3 cf::player	1107	=head3 cf::player
1007		1108
1008	=over 4	1109	=over 4
1009		1110
1010	=item cf::player::exists $login	1111	=item cf::player::find $login
1011		1112
1012	Returns true when the given account exists.	1113	Returns the given player object, loading it if necessary (might block).
1013		1114
1014	=cut	1115	=cut
1015		1116
1016	sub cf::player::exists($) {	1117	sub playerdir($) {
1017	cf::player::find $_[0]	1118	cf::localdir
1018	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	1119	. "/"
		1120	. cf::playerdir
		1121	. "/"
		1122	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		1123	}
		1124
		1125	sub path($) {
		1126	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		1127
		1128	(playerdir $login) . "/$login.pl"
		1129	}
		1130
		1131	sub find_active($) {
		1132	$cf::PLAYER{$_[0]}
		1133	and $cf::PLAYER{$_[0]}->active
		1134	and $cf::PLAYER{$_[0]}
		1135	}
		1136
		1137	sub exists($) {
		1138	my ($login) = @_;
		1139
		1140	$cf::PLAYER{$login}
		1141	or cf::sync_job { !aio_stat $login }
		1142	}
		1143
		1144	sub find($) {
		1145	return $cf::PLAYER{$_[0]} \|\| do {
		1146	my $login = $_[0];
		1147
		1148	my $guard = cf::lock_acquire "user_find:$login";
		1149
		1150	$cf::PLAYER{$_[0]} \|\| do {
		1151	my $pl = load_pl path $login
		1152	or return;
		1153	$cf::PLAYER{$login} = $pl
		1154	}
		1155	}
		1156	}
		1157
		1158	sub save($) {
		1159	my ($pl) = @_;
		1160
		1161	return if $pl->{deny_save};
		1162
		1163	my $path = path $pl;
		1164	my $guard = cf::lock_acquire "user_save:$path";
		1165
		1166	return if $pl->{deny_save};
		1167
		1168	aio_mkdir playerdir $pl, 0770;
		1169	$pl->{last_save} = $cf::RUNTIME;
		1170
		1171	$pl->save_pl ($path);
		1172	Coro::cede;
		1173	}
		1174
		1175	sub new($) {
		1176	my ($login) = @_;
		1177
		1178	my $self = create;
		1179
		1180	$self->ob->name ($login);
		1181	$self->{deny_save} = 1;
		1182
		1183	$cf::PLAYER{$login} = $self;
		1184
		1185	$self
		1186	}
		1187
		1188	=item $pl->quit_character
		1189
		1190	Nukes the player without looking back. If logged in, the connection will
		1191	be destroyed. May block for a long time.
		1192
		1193	=cut
		1194
		1195	sub quit_character {
		1196	my ($pl) = @_;
		1197
		1198	$pl->{deny_save} = 1;
		1199	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1200
		1201	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1202	$pl->deactivate;
		1203	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1204	$pl->ns->destroy if $pl->ns;
		1205
		1206	my $path = playerdir $pl;
		1207	my $temp = "$path~$cf::RUNTIME~deleting~";
		1208	aio_rename $path, $temp;
		1209	delete $cf::PLAYER{$pl->ob->name};
		1210	$pl->destroy;
		1211	IO::AIO::aio_rmtree $temp;
		1212	}
		1213
		1214	=item cf::player::list_logins
		1215
		1216	Returns am arrayref of all valid playernames in the system, can take a
		1217	while and may block, so not sync_job-capable, ever.
		1218
		1219	=cut
		1220
		1221	sub list_logins {
		1222	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
		1223	or return [];
		1224
		1225	my @logins;
		1226
		1227	for my $login (@$dirs) {
		1228	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
		1229	aio_read $fh, 0, 512, my $buf, 0 or next;
		1230	$buf !~ /^password -------------$/ or next; # official not-valid tag
		1231
		1232	utf8::decode $login;
		1233	push @logins, $login;
		1234	}
		1235
		1236	\@logins
		1237	}
		1238
		1239	=item $player->maps
		1240
		1241	Returns an arrayref of cf::path's of all maps that are private for this
		1242	player. May block.
		1243
		1244	=cut
		1245
		1246	sub maps($) {
		1247	my ($pl) = @_;
		1248
		1249	my $files = aio_readdir playerdir $pl
		1250	or return;
		1251
		1252	my @paths;
		1253
		1254	for (@$files) {
		1255	utf8::decode $_;
		1256	next if /\.(?:pl\|pst)$/;
		1257	next unless /^$PATH_SEP/;
		1258
		1259	s/$PATH_SEP/\//g;
		1260	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
		1261	}
		1262
		1263	\@paths
1019	}	1264	}
1020		1265
1021	=item $player->ext_reply ($msgid, $msgtype, %msg)	1266	=item $player->ext_reply ($msgid, $msgtype, %msg)
1022		1267
1023	Sends an ext reply to the player.	1268	Sends an ext reply to the player.
1024		1269
1025	=cut	1270	=cut
1026		1271
1027	sub cf::player::ext_reply($$$%) {	1272	sub ext_reply($$$%) {
1028	my ($self, $id, %msg) = @_;	1273	my ($self, $id, %msg) = @_;
1029		1274
1030	$msg{msgid} = $id;	1275	$msg{msgid} = $id;
1031		1276
1032	$self->send ("ext " . to_json \%msg);	1277	$self->send ("ext " . cf::to_json \%msg);
1033	}	1278	}
		1279
		1280	package cf;
1034		1281
1035	=back	1282	=back
1036		1283
1037		1284
1038	=head3 cf::map	1285	=head3 cf::map
…		…
1044	package cf::map;	1291	package cf::map;
1045		1292
1046	use Fcntl;	1293	use Fcntl;
1047	use Coro::AIO;	1294	use Coro::AIO;
1048		1295
1049	our $MAX_RESET = 7200;	1296	our $MAX_RESET = 3600;
1050	our $DEFAULT_RESET = 3600;	1297	our $DEFAULT_RESET = 3000;
1051	$MAX_RESET = 10;#d#
1052	$DEFAULT_RESET = 10;#d#
1053		1298
1054	sub generate_random_map {	1299	sub generate_random_map {
1055	my ($path, $rmp) = @_;	1300	my ($path, $rmp) = @_;
1056		1301
1057	# mit "rum" bekleckern, nicht	1302	# mit "rum" bekleckern, nicht
…		…
1073	# and all this just because we cannot iterate over	1318	# and all this just because we cannot iterate over
1074	# all maps in C++...	1319	# all maps in C++...
1075	sub change_all_map_light {	1320	sub change_all_map_light {
1076	my ($change) = @_;	1321	my ($change) = @_;
1077		1322
1078	$_->change_map_light ($change) for values %cf::MAP;	1323	$_->change_map_light ($change)
		1324	for grep $_->outdoor, values %cf::MAP;
1079	}	1325	}
1080		1326
1081	sub try_load_header($) {	1327	sub try_load_header($) {
1082	my ($path) = @_;	1328	my ($path) = @_;
1083		1329
…		…
1086	or return;	1332	or return;
1087		1333
1088	my $map = cf::map::new	1334	my $map = cf::map::new
1089	or return;	1335	or return;
1090		1336
		1337	# for better error messages only, will be overwritten
		1338	$map->path ($path);
		1339
1091	$map->load_header ($path)	1340	$map->load_header ($path)
1092	or return;	1341	or return;
1093		1342
1094	$map->{load_path} = $path;	1343	$map->{load_path} = $path;
1095	use Data::Dumper; warn Dumper $map;#d#
1096		1344
1097	$map	1345	$map
1098	}	1346	}
1099		1347
		1348	sub find;
1100	sub find_map {	1349	sub find {
1101	my ($path, $origin) = @_;	1350	my ($path, $origin) = @_;
1102		1351
1103	#warn "find_map<$path,$origin>\n";#d#	1352	#warn "find<$path,$origin>\n";#d#
1104		1353
1105	$path = ref $path ? $path : new cf::path $path, $origin && $origin->path;	1354	$path = new cf::path $path, $origin && $origin->path;
1106	my $key = $path->as_string;	1355	my $key = $path->as_string;
1107		1356
		1357	cf::lock_wait "map_find:$key";
		1358
1108	$cf::MAP{$key} \|\| do {	1359	$cf::MAP{$key} \|\| do {
		1360	my $guard = cf::lock_acquire "map_find:$key";
		1361
1109	# do it the slow way	1362	# do it the slow way
1110	my $map = try_load_header $path->save_path;	1363	my $map = try_load_header $path->save_path;
1111		1364
		1365	Coro::cede;
		1366
1112	if ($map) {	1367	if ($map) {
		1368	$map->last_access ((delete $map->{last_access})
		1369	\|\| $cf::RUNTIME); #d#
1113	# safety	1370	# safety
1114	$map->{instantiate_time} = $cf::RUNTIME	1371	$map->{instantiate_time} = $cf::RUNTIME
1115	if $map->{instantiate_time} > $cf::RUNTIME;	1372	if $map->{instantiate_time} > $cf::RUNTIME;
1116	} else {	1373	} else {
1117	if (my $rmp = $path->random_map_params) {	1374	if (my $rmp = $path->random_map_params) {
…		…
1122		1379
1123	$map or return;	1380	$map or return;
1124		1381
1125	$map->{load_original} = 1;	1382	$map->{load_original} = 1;
1126	$map->{instantiate_time} = $cf::RUNTIME;	1383	$map->{instantiate_time} = $cf::RUNTIME;
		1384	$map->last_access ($cf::RUNTIME);
1127	$map->instantiate;	1385	$map->instantiate;
1128		1386
1129	# per-player maps become, after loading, normal maps	1387	# per-player maps become, after loading, normal maps
1130	$map->per_player (0) if $path->{user_rel};	1388	$map->per_player (0) if $path->{user_rel};
1131	}	1389	}
1132		1390
1133	$map->path ($key);	1391	$map->path ($key);
1134	$map->{path} = $path;	1392	$map->{path} = $path;
1135	$map->last_access ($cf::RUNTIME);	1393	$map->{last_save} = $cf::RUNTIME;
1136		1394
		1395	Coro::cede;
		1396
1137	$map->reset if $map->should_reset;	1397	if ($map->should_reset) {
		1398	$map->reset;
		1399	undef $guard;
		1400	$map = find $path
		1401	or return;
		1402	}
1138		1403
1139	$cf::MAP{$key} = $map	1404	$cf::MAP{$key} = $map
1140	}	1405	}
1141	}	1406	}
1142		1407
1143	sub load {	1408	sub load {
1144	my ($self) = @_;	1409	my ($self) = @_;
1145		1410
		1411	my $path = $self->{path};
		1412	my $guard = cf::lock_acquire "map_load:" . $path->as_string;
		1413
1146	return if $self->in_memory != cf::MAP_SWAPPED;	1414	return if $self->in_memory != cf::MAP_SWAPPED;
1147		1415
1148	$self->in_memory (cf::MAP_LOADING);	1416	$self->in_memory (cf::MAP_LOADING);
1149
1150	my $path = $self->{path};
1151		1417
1152	$self->alloc;	1418	$self->alloc;
1153	$self->load_objects ($self->{load_path}, 1)	1419	$self->load_objects ($self->{load_path}, 1)
1154	or return;	1420	or return;
1155		1421
1156	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) if delete $self->{load_original};	1422	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1423	if delete $self->{load_original};
1157		1424
1158	if (my $uniq = $path->uniq_path) {	1425	if (my $uniq = $path->uniq_path) {
1159	utf8::encode $uniq;	1426	utf8::encode $uniq;
1160	if (aio_open $uniq, O_RDONLY, 0) {	1427	if (aio_open $uniq, O_RDONLY, 0) {
1161	$self->clear_unique_items;	1428	$self->clear_unique_items;
1162	$self->load_objects ($uniq, 0);	1429	$self->load_objects ($uniq, 0);
1163	}	1430	}
1164	}	1431	}
		1432
		1433	Coro::cede;
1165		1434
1166	# now do the right thing for maps	1435	# now do the right thing for maps
1167	$self->link_multipart_objects;	1436	$self->link_multipart_objects;
1168		1437
1169	if ($self->{path}->is_style_map) {	1438	if ($self->{path}->is_style_map) {
…		…
1177	$self->difficulty ($self->estimate_difficulty)	1446	$self->difficulty ($self->estimate_difficulty)
1178	unless $self->difficulty;	1447	unless $self->difficulty;
1179	$self->activate;	1448	$self->activate;
1180	}	1449	}
1181		1450
		1451	Coro::cede;
		1452
1182	$self->in_memory (cf::MAP_IN_MEMORY);	1453	$self->in_memory (cf::MAP_IN_MEMORY);
1183	}	1454	}
1184		1455
1185	sub load_map_sync {	1456	sub find_sync {
1186	my ($path, $origin) = @_;	1457	my ($path, $origin) = @_;
1187		1458
1188	#warn "load_map_sync<$path, $origin>\n";#d#	1459	cf::sync_job { cf::map::find $path, $origin }
		1460	}
1189		1461
1190	cf::sync_job {	1462	sub do_load_sync {
1191	my $map = cf::map::find_map $path, $origin	1463	my ($map) = @_;
1192	or return;	1464
1193	$map->load;	1465	cf::sync_job { $map->load };
1194	$map
1195	}
1196	}	1466	}
1197		1467
1198	sub save {	1468	sub save {
1199	my ($self) = @_;	1469	my ($self) = @_;
1200		1470
		1471	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1472
		1473	$self->{last_save} = $cf::RUNTIME;
		1474
		1475	return unless $self->dirty;
		1476
1201	my $save = $self->{path}->save_path; utf8::encode $save;	1477	my $save = $self->{path}->save_path; utf8::encode $save;
1202	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1478	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1203		1479
1204	$self->{last_save} = $cf::RUNTIME;
1205
1206	return unless $self->dirty;
1207
1208	$self->{load_path} = $save;	1480	$self->{load_path} = $save;
1209		1481
1210	return if $self->{deny_save};	1482	return if $self->{deny_save};
1211		1483
1212	warn "saving map ", $self->path;	1484	local $self->{last_access} = $self->last_access;#d#
		1485
		1486	cf::async {
		1487	$_->contr->save for $self->players;
		1488	};
1213		1489
1214	if ($uniq) {	1490	if ($uniq) {
1215	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	1491	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
1216	$self->save_objects ($uniq, cf::IO_UNIQUES);	1492	$self->save_objects ($uniq, cf::IO_UNIQUES);
1217	} else {	1493	} else {
…		…
1220	}	1496	}
1221		1497
1222	sub swap_out {	1498	sub swap_out {
1223	my ($self) = @_;	1499	my ($self) = @_;
1224		1500
		1501	# save first because save cedes
		1502	$self->save;
		1503
		1504	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1505
1225	return if $self->players;	1506	return if $self->players;
1226	return if $self->in_memory != cf::MAP_IN_MEMORY;	1507	return if $self->in_memory != cf::MAP_IN_MEMORY;
1227	return if $self->{deny_save};	1508	return if $self->{deny_save};
1228		1509
1229	$self->save;
1230	$self->clear;	1510	$self->clear;
1231	$self->in_memory (cf::MAP_SWAPPED);	1511	$self->in_memory (cf::MAP_SWAPPED);
1232	}	1512	}
1233		1513
		1514	sub reset_at {
		1515	my ($self) = @_;
		1516
		1517	# TODO: safety, remove and allow resettable per-player maps
		1518	return 1e99 if $self->{path}{user_rel};
		1519	return 1e99 if $self->{deny_reset};
		1520
		1521	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		1522	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
		1523
		1524	$time + $to
		1525	}
		1526
1234	sub should_reset {	1527	sub should_reset {
1235	my ($map) = @_;	1528	my ($self) = @_;
1236		1529
1237	# TODO: safety, remove and allow resettable per-player maps	1530	$self->reset_at <= $cf::RUNTIME
1238	return if $map->{path}{user_rel};#d#
1239	return if $map->{deny_reset};
1240	#return unless $map->reset_timeout;
1241
1242	my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1243	my $to = $map->reset_timeout \|\| $DEFAULT_RESET;
1244	$to = $MAX_RESET if $to > $MAX_RESET;
1245
1246	$time + $to < $cf::RUNTIME
1247	}	1531	}
1248		1532
1249	sub unlink_save {	1533	sub unlink_save {
1250	my ($self) = @_;	1534	my ($self) = @_;
1251		1535
1252	utf8::encode (my $save = $self->{path}->save_path);	1536	utf8::encode (my $save = $self->{path}->save_path);
1253	aioreq_pri 3; IO::AIO::aio_unlink $save;	1537	aioreq_pri 3; IO::AIO::aio_unlink $save;
1254	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";	1538	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1255	}	1539	}
1256		1540
		1541	sub rename {
		1542	my ($self, $new_path) = @_;
		1543
		1544	$self->unlink_save;
		1545
		1546	delete $cf::MAP{$self->path};
		1547	$self->{path} = new cf::path $new_path;
		1548	$self->path ($self->{path}->as_string);
		1549	$cf::MAP{$self->path} = $self;
		1550
		1551	$self->save;
		1552	}
		1553
1257	sub reset {	1554	sub reset {
1258	my ($self) = @_;	1555	my ($self) = @_;
1259		1556
		1557	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1558
1260	return if $self->players;	1559	return if $self->players;
1261	return if $self->{path}{user_rel};#d#	1560	return if $self->{path}{user_rel};#d#
1262		1561
1263	warn "resetting map ", $self->path;#d#	1562	warn "resetting map ", $self->path;#d#
1264		1563
…		…
1268		1567
1269	$self->unlink_save;	1568	$self->unlink_save;
1270	$self->destroy;	1569	$self->destroy;
1271	}	1570	}
1272		1571
		1572	my $nuke_counter = "aaaa";
		1573
		1574	sub nuke {
		1575	my ($self) = @_;
		1576
		1577	$self->{deny_save} = 1;
		1578	$self->reset_timeout (1);
		1579	$self->rename ("{nuke}/" . ($nuke_counter++));
		1580	$self->reset; # polite request, might not happen
		1581	}
		1582
1273	sub customise_for {	1583	sub customise_for {
1274	my ($map, $ob) = @_;	1584	my ($map, $ob) = @_;
1275		1585
1276	if ($map->per_player) {	1586	if ($map->per_player) {
1277	return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path};	1587	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1278	}	1588	}
1279		1589
1280	$map	1590	$map
1281	}	1591	}
1282		1592
1283	sub emergency_save {	1593	sub emergency_save {
1284	local $cf::FREEZE = 1;	1594	my $freeze_guard = cf::freeze_mainloop;
1285		1595
1286	warn "enter emergency map save\n";	1596	warn "enter emergency perl save\n";
1287		1597
1288	cf::sync_job {	1598	cf::sync_job {
		1599	warn "begin emergency player save\n";
		1600	$_->save for values %cf::PLAYER;
		1601	warn "end emergency player save\n";
		1602
1289	warn "begin emergency map save\n";	1603	warn "begin emergency map save\n";
1290	$_->save for values %cf::MAP;	1604	$_->save for values %cf::MAP;
		1605	warn "end emergency map save\n";
1291	};	1606	};
1292		1607
1293	warn "end emergency map save\n";	1608	warn "leave emergency perl save\n";
1294	}	1609	}
1295		1610
1296	package cf;	1611	package cf;
1297		1612
1298	=back	1613	=back
…		…
1340	(ref $cf::CFG{"may_$access"}	1655	(ref $cf::CFG{"may_$access"}
1341	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	1656	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1342	: $cf::CFG{"may_$access"})	1657	: $cf::CFG{"may_$access"})
1343	}	1658	}
1344		1659
		1660	=item $player_object->enter_link
		1661
		1662	Freezes the player and moves him/her to a special map (C<{link}>).
		1663
		1664	The player should be reaosnably safe there for short amounts of time. You
		1665	I<MUST> call C<leave_link> as soon as possible, though.
		1666
		1667	=item $player_object->leave_link ($map, $x, $y)
		1668
		1669	Moves the player out of the specila link map onto the given map. If the
		1670	map is not valid (or omitted), the player will be moved back to the
		1671	location he/she was before the call to C<enter_link>, or, if that fails,
		1672	to the emergency map position.
		1673
		1674	Might block.
		1675
		1676	=cut
		1677
1345	sub cf::object::player::enter_link {	1678	sub cf::object::player::enter_link {
1346	my ($self) = @_;	1679	my ($self) = @_;
1347		1680
		1681	$self->deactivate_recursive;
		1682
1348	return if $self->map == $LINK_MAP;	1683	return if $self->map == $LINK_MAP;
1349		1684
1350	$self->{_link_pos} = [$self->map->{path}, $self->x, $self->y]	1685	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1351	if $self->map;	1686	if $self->map;
1352		1687
1353	$self->enter_map ($LINK_MAP, 20, 20);	1688	$self->enter_map ($LINK_MAP, 20, 20);
1354	$self->deactivate_recursive;
1355	}	1689	}
1356		1690
1357	sub cf::object::player::leave_link {	1691	sub cf::object::player::leave_link {
1358	my ($self, $map, $x, $y) = @_;	1692	my ($self, $map, $x, $y) = @_;
1359		1693
1360	my $link_pos = delete $self->{_link_pos};	1694	my $link_pos = delete $self->{_link_pos};
1361		1695
1362	unless ($map) {	1696	unless ($map) {
1363	$self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1364
1365	# restore original map position	1697	# restore original map position
1366	($map, $x, $y) = @{ $link_pos \|\| [] };	1698	($map, $x, $y) = @{ $link_pos \|\| [] };
1367	$map = cf::map::find_map $map;	1699	$map = cf::map::find $map;
1368		1700
1369	unless ($map) {	1701	unless ($map) {
1370	($map, $x, $y) = @$EMERGENCY_POSITION;	1702	($map, $x, $y) = @$EMERGENCY_POSITION;
1371	$map = cf::map::find_map $map	1703	$map = cf::map::find $map
1372	or die "FATAL: cannot load emergency map\n";	1704	or die "FATAL: cannot load emergency map\n";
1373	}	1705	}
1374	}	1706	}
1375		1707
1376	($x, $y) = (-1, -1)	1708	($x, $y) = (-1, -1)
…		…
1380	($x, $y) = ($map->enter_x, $map->enter_y)	1712	($x, $y) = ($map->enter_x, $map->enter_y)
1381	if $x <=0 && $y <= 0;	1713	if $x <=0 && $y <= 0;
1382		1714
1383	$map->load;	1715	$map->load;
1384		1716
		1717	return unless $self->contr->active;
1385	$self->activate_recursive;	1718	$self->activate_recursive;
1386	$self->enter_map ($map, $x, $y);	1719	$self->enter_map ($map, $x, $y);
1387	}	1720	}
1388		1721
		1722	cf::player->attach (
		1723	on_logout => sub {
		1724	my ($pl) = @_;
		1725
		1726	# abort map switching before logout
		1727	if ($pl->ob->{_link_pos}) {
		1728	cf::sync_job {
		1729	$pl->ob->leave_link
		1730	};
		1731	}
		1732	},
		1733	on_login => sub {
		1734	my ($pl) = @_;
		1735
		1736	# try to abort aborted map switching on player login :)
		1737	# should happen only on crashes
		1738	if ($pl->ob->{_link_pos}) {
		1739	$pl->ob->enter_link;
		1740	(async {
		1741	# we need this sleep as the login has a concurrent enter_exit running
		1742	# and this sleep increases chances of the player not ending up in scorn
		1743	$pl->ob->reply (undef,
		1744	"There was an internal problem at your last logout, "
		1745	. "the server will try to bring you to your intended destination in a second.",
		1746	cf::NDI_RED);
		1747	Coro::Timer::sleep 1;
		1748	$pl->ob->leave_link;
		1749	})->prio (2);
		1750	}
		1751	},
		1752	);
		1753
1389	=item $player_object->goto_map ($map, $x, $y)	1754	=item $player_object->goto ($path, $x, $y)
1390		1755
1391	=cut	1756	=cut
1392		1757
1393	sub cf::object::player::goto_map {	1758	sub cf::object::player::goto {
1394	my ($self, $path, $x, $y) = @_;	1759	my ($self, $path, $x, $y) = @_;
1395		1760
		1761	$path = new cf::path $path;
		1762	$path ne "/" or Carp::cluck ("oy");#d#
		1763
1396	$self->enter_link;	1764	$self->enter_link;
1397		1765
1398	(Coro::async {	1766	(async {
1399	$path = new cf::path $path;
1400
1401	my $map = cf::map::find_map $path->as_string;	1767	my $map = cf::map::find $path->as_string;
1402	$map = $map->customise_for ($self) if $map;	1768	$map = $map->customise_for ($self) if $map;
1403		1769
1404	warn "entering ", $map->path, " at ($x, $y)\n"	1770	# warn "entering ", $map->path, " at ($x, $y)\n"
1405	if $map;	1771	# if $map;
		1772
		1773	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1406		1774
1407	$self->leave_link ($map, $x, $y);	1775	$self->leave_link ($map, $x, $y);
1408	})->prio (1);	1776	})->prio (1);
1409	}	1777	}
1410		1778
…		…
1463		1831
1464	return unless $self->type == cf::PLAYER;	1832	return unless $self->type == cf::PLAYER;
1465		1833
1466	$self->enter_link;	1834	$self->enter_link;
1467		1835
1468	(Coro::async {	1836	(async {
		1837	$self->deactivate_recursive; # just to be sure
1469	unless (eval {	1838	unless (eval {
1470
1471	prepare_random_map $exit	1839	prepare_random_map $exit
1472	if $exit->slaying eq "/!";	1840	if $exit->slaying eq "/!";
1473		1841
1474	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;	1842	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1475	$self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);	1843	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1476		1844
1477	1;	1845	1;
1478	}) {	1846	}) {
1479	$self->message ("Something went wrong deep within the crossfire server. "	1847	$self->message ("Something went wrong deep within the crossfire server. "
1480	. "I'll try to bring you back to the map you were before. "	1848	. "I'll try to bring you back to the map you were before. "
…		…
1537	on_reply => sub {	1905	on_reply => sub {
1538	my ($ns, $msg) = @_;	1906	my ($ns, $msg) = @_;
1539		1907
1540	# this weird shuffling is so that direct followup queries	1908	# this weird shuffling is so that direct followup queries
1541	# get handled first	1909	# get handled first
1542	my $queue = delete $ns->{query_queue};	1910	my $queue = delete $ns->{query_queue}
		1911	or return; # be conservative, not sure how that can happen, but we saw a crash here
1543		1912
1544	(shift @$queue)->[1]->($msg);	1913	(shift @$queue)->[1]->($msg);
1545		1914
1546	push @{ $ns->{query_queue} }, @$queue;	1915	push @{ $ns->{query_queue} }, @$queue;
1547		1916
…		…
1553	}	1922	}
1554	}	1923	}
1555	},	1924	},
1556	);	1925	);
1557		1926
1558	=item $client->coro (\&cb)	1927	=item $client->async (\&cb)
1559		1928
1560	Create a new coroutine, running the specified callback. The coroutine will	1929	Create a new coroutine, running the specified callback. The coroutine will
1561	be automatically cancelled when the client gets destroyed (e.g. on logout,	1930	be automatically cancelled when the client gets destroyed (e.g. on logout,
1562	or loss of connection).	1931	or loss of connection).
1563		1932
1564	=cut	1933	=cut
1565		1934
1566	sub cf::client::coro {	1935	sub cf::client::async {
1567	my ($self, $cb) = @_;	1936	my ($self, $cb) = @_;
1568		1937
1569	my $coro; $coro = async {	1938	my $coro = &Coro::async ($cb);
1570	eval {
1571	$cb->();
1572	};
1573	warn $@ if $@;
1574	};
1575		1939
1576	$coro->on_destroy (sub {	1940	$coro->on_destroy (sub {
1577	delete $self->{_coro}{$coro+0};	1941	delete $self->{_coro}{$coro+0};
1578	});	1942	});
1579		1943
…		…
1751		2115
1752	{	2116	{
1753	my $path = cf::localdir . "/database.pst";	2117	my $path = cf::localdir . "/database.pst";
1754		2118
1755	sub db_load() {	2119	sub db_load() {
1756	warn "loading database $path\n";#d# remove later
1757	$DB = stat $path ? Storable::retrieve $path : { };	2120	$DB = stat $path ? Storable::retrieve $path : { };
1758	}	2121	}
1759		2122
1760	my $pid;	2123	my $pid;
1761		2124
1762	sub db_save() {	2125	sub db_save() {
1763	warn "saving database $path\n";#d# remove later
1764	waitpid $pid, 0 if $pid;	2126	waitpid $pid, 0 if $pid;
1765	if (0 == ($pid = fork)) {	2127	if (0 == ($pid = fork)) {
1766	$DB->{_meta}{version} = 1;	2128	$DB->{_meta}{version} = 1;
1767	Storable::nstore $DB, "$path~";	2129	Storable::nstore $DB, "$path~";
1768	rename "$path~", $path;	2130	rename "$path~", $path;
…		…
1816	open my $fh, "<:utf8", cf::confdir . "/config"	2178	open my $fh, "<:utf8", cf::confdir . "/config"
1817	or return;	2179	or return;
1818		2180
1819	local $/;	2181	local $/;
1820	*CFG = YAML::Syck::Load <$fh>;	2182	*CFG = YAML::Syck::Load <$fh>;
		2183
		2184	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
		2185
		2186	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2187	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2188
		2189	if (exists $CFG{mlockall}) {
		2190	eval {
		2191	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
		2192	and die "WARNING: m(un)lockall failed: $!\n";
		2193	};
		2194	warn $@ if $@;
		2195	}
1821	}	2196	}
1822		2197
1823	sub main {	2198	sub main {
1824	# we must not ever block the main coroutine	2199	# we must not ever block the main coroutine
1825	local $Coro::idle = sub {	2200	local $Coro::idle = sub {
1826	Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d#	2201	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1827	(Coro::unblock_sub {
1828	Event::one_event;	2202	async { Event::one_event };
1829	})->();
1830	};	2203	};
1831		2204
1832	cfg_load;	2205	cfg_load;
1833	db_load;	2206	db_load;
1834	load_extensions;	2207	load_extensions;
…		…
1845	return;	2218	return;
1846	}	2219	}
1847		2220
1848	warn "reloading...";	2221	warn "reloading...";
1849		2222
1850	local $FREEZE = 1;	2223	my $guard = freeze_mainloop;
1851	cf::emergency_save;	2224	cf::emergency_save;
1852		2225
1853	eval {	2226	eval {
1854	# if anything goes wrong in here, we should simply crash as we already saved	2227	# if anything goes wrong in here, we should simply crash as we already saved
1855		2228
…		…
1917	cf::load_extensions;	2290	cf::load_extensions;
1918		2291
1919	# reattach attachments to objects	2292	# reattach attachments to objects
1920	warn "reattach";	2293	warn "reattach";
1921	_global_reattach;	2294	_global_reattach;
		2295	reattach $_ for values %MAP;
1922	};	2296	};
1923		2297
1924	if ($@) {	2298	if ($@) {
1925	warn $@;	2299	warn $@;
1926	warn "error while reloading, exiting.";	2300	warn "error while reloading, exiting.";
…		…
1942	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";	2316	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1943	$LINK_MAP->in_memory (MAP_IN_MEMORY);	2317	$LINK_MAP->in_memory (MAP_IN_MEMORY);
1944		2318
1945	# dirty hack because... archetypes are not yet loaded	2319	# dirty hack because... archetypes are not yet loaded
1946	Event->timer (	2320	Event->timer (
1947	after => 2,	2321	after => 10,
1948	cb => sub {	2322	cb => sub {
1949	$_[0]->w->cancel;	2323	$_[0]->w->cancel;
1950		2324
1951	# provide some exits "home"	2325	# provide some exits "home"
1952	my $exit = cf::object::new "exit";	2326	my $exit = cf::object::new "exit";
…		…
1991	reentrant => 0,	2365	reentrant => 0,
1992	prio => 0,	2366	prio => 0,
1993	at => $NEXT_TICK \|\| $TICK,	2367	at => $NEXT_TICK \|\| $TICK,
1994	data => WF_AUTOCANCEL,	2368	data => WF_AUTOCANCEL,
1995	cb => sub {	2369	cb => sub {
1996	unless ($FREEZE) {
1997	cf::server_tick; # one server iteration	2370	cf::server_tick; # one server iteration
1998	$RUNTIME += $TICK;	2371	$RUNTIME += $TICK;
1999	}
2000
2001	$NEXT_TICK += $TICK;	2372	$NEXT_TICK += $TICK;
2002		2373
2003	# if we are delayed by four ticks or more, skip them all	2374	# if we are delayed by four ticks or more, skip them all
2004	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2375	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2005		2376
…		…
2028	or warn "ERROR: unable to write runtime file: $!";	2399	or warn "ERROR: unable to write runtime file: $!";
2029	})->();	2400	})->();
2030	},	2401	},
2031	);	2402	);
2032		2403
		2404	END { cf::emergency_save }
		2405
2033	1	2406	1
2034		2407

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.111 by root, Mon Jan 1 12:28:47 2007 UTC vs. Revision 1.154 by root, Tue Jan 9 15:36:19 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.111 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.154 by root, Tue Jan 9 15:36:19 2007 UTC