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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.134 by root, Thu Jan 4 17:28:49 2007 UTC vs.
Revision 1.159 by root, Wed Jan 10 22:50:12 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 (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 = ();
		38
		39	our @EXTS = (); # list of extension package names
37	our %EXTCMD = ();	40	our %EXTCMD = ();
		41	our %EXT_CORO = (); # coroutines bound to extensions
38		42
39	our @EVENT;	43	our @EVENT;
40	our $LIBDIR = datadir . "/ext";	44	our $LIBDIR = datadir . "/ext";
41		45
42	our $TICK = MAX_TIME * 1e-6;	46	our $TICK = MAX_TIME * 1e-6;
…		…
47	our %CFG;	51	our %CFG;
48		52
49	our $UPTIME; $UPTIME \|\|= time;	53	our $UPTIME; $UPTIME \|\|= time;
50	our $RUNTIME;	54	our $RUNTIME;
51		55
		56	our %PLAYER; # all users
52	our %MAP; # all maps	57	our %MAP; # all maps
53	our $LINK_MAP; # the special {link} map	58	our $LINK_MAP; # the special {link} map
54	our $RANDOM_MAPS = cf::localdir . "/random";	59	our $RANDOM_MAPS = cf::localdir . "/random";
55	our %EXT_CORO;	60
		61	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
		62	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
56		63
57	binmode STDOUT;	64	binmode STDOUT;
58	binmode STDERR;	65	binmode STDERR;
59		66
60	# read virtual server time, if available	67	# read virtual server time, if available
…		…
105	=item %cf::CFG	112	=item %cf::CFG
106		113
107	Configuration for the server, loaded from C</etc/crossfire/config>, or	114	Configuration for the server, loaded from C</etc/crossfire/config>, or
108	from wherever your confdir points to.	115	from wherever your confdir points to.
109		116
		117	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
		118
		119	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
		120	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
		121	processing has been done. Call C<< ->wait >> on them to maximise the
		122	window of cpu time available, or simply to synchronise to the server tick.
		123
110	=back	124	=back
111		125
112	=cut	126	=cut
113		127
114	BEGIN {	128	BEGIN {
…		…
117	utf8::encode $msg;	131	utf8::encode $msg;
118		132
119	$msg .= "\n"	133	$msg .= "\n"
120	unless $msg =~ /\n$/;	134	unless $msg =~ /\n$/;
121		135
122	LOG llevError, "cfperl: $msg";	136	LOG llevError, $msg;
123	};	137	};
124	}	138	}
125		139
126	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	140	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	141	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
145		159
146	$Event::DIED = sub {	160	$Event::DIED = sub {
147	warn "error in event callback: @_";	161	warn "error in event callback: @_";
148	};	162	};
149		163
150	my %ext_pkg;
151	my @exts;
152	my @hook;
153
154	=head2 UTILITY FUNCTIONS	164	=head2 UTILITY FUNCTIONS
155		165
156	=over 4	166	=over 4
157		167
		168	=item dumpval $ref
		169
158	=cut	170	=cut
		171
		172	sub dumpval {
		173	eval {
		174	local $SIG{__DIE__};
		175	my $d;
		176	if (1) {
		177	$d = new Data::Dumper([$_[0]], ["*var"]);
		178	$d->Terse(1);
		179	$d->Indent(2);
		180	$d->Quotekeys(0);
		181	$d->Useqq(1);
		182	#$d->Bless(...);
		183	$d->Seen($_[1]) if @_ > 1;
		184	$d = $d->Dump();
		185	}
		186	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
		187	$d
		188	} \|\| "[unable to dump $_[0]: '$@']";
		189	}
159		190
160	use JSON::Syck (); # TODO# replace by JSON::PC once working	191	use JSON::Syck (); # TODO# replace by JSON::PC once working
161		192
162	=item $ref = cf::from_json $json	193	=item $ref = cf::from_json $json
163		194
…		…
179	sub to_json($) {	210	sub to_json($) {
180	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	211	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
181	JSON::Syck::Dump $_[0]	212	JSON::Syck::Dump $_[0]
182	}	213	}
183		214
184	=item my $guard = cf::guard { BLOCK }
185
186	Run the given callback when the guard object gets destroyed (useful for
187	coroutine cancellations).
188
189	You can call C<< ->cancel >> on the guard object to stop the block from
190	being executed.
191
192	=cut
193
194	sub guard(&) {
195	bless \(my $cb = $_[0]), cf::guard::;
196	}
197
198	sub cf::guard::cancel {
199	${$_[0]} = sub { };
200	}
201
202	sub cf::guard::DESTROY {
203	${$_[0]}->();
204	}
205
206	=item cf::lock_wait $string	215	=item cf::lock_wait $string
207		216
208	Wait until the given lock is available. See cf::lock_acquire.	217	Wait until the given lock is available. See cf::lock_acquire.
209		218
210	=item my $lock = cf::lock_acquire $string	219	=item my $lock = cf::lock_acquire $string
211		220
212	Wait until the given lock is available and then acquires it and returns	221	Wait until the given lock is available and then acquires it and returns
213	a guard object. If the guard object gets destroyed (goes out of scope,	222	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
214	for example when the coroutine gets canceled), the lock is automatically	223	for example when the coroutine gets canceled), the lock is automatically
215	returned.	224	returned.
216		225
217	Lock names should begin with a unique identifier (for example, cf::map::find	226	Lock names should begin with a unique identifier (for example, cf::map::find
218	uses map_find and cf::map::load uses map_load).	227	uses map_find and cf::map::load uses map_load).
…		…
237	# wait, to be sure we are not locked	246	# wait, to be sure we are not locked
238	lock_wait $key;	247	lock_wait $key;
239		248
240	$LOCK{$key} = [];	249	$LOCK{$key} = [];
241		250
242	cf::guard {	251	Coro::guard {
243	# wake up all waiters, to be on the safe side	252	# wake up all waiters, to be on the safe side
244	$_->ready for @{ delete $LOCK{$key} };	253	$_->ready for @{ delete $LOCK{$key} };
245	}	254	}
246	}	255	}
247		256
248	=item cf::async { BLOCK }
249
250	Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251	error instead of exiting the server in case of a problem.
252
253	=cut
254
255	sub async(&) {
256	my ($cb) = @_;
257
258	Coro::async {
259	eval { $cb->() };
260	warn $@ if $@;
261	}
262	}
263
264	sub freeze_mainloop {	257	sub freeze_mainloop {
265	return unless $TICK_WATCHER->is_active;	258	return unless $TICK_WATCHER->is_active;
266		259
267	my $guard = guard { $TICK_WATCHER->start };	260	my $guard = Coro::guard { $TICK_WATCHER->start };
268	$TICK_WATCHER->stop;	261	$TICK_WATCHER->stop;
269	$guard	262	$guard
270	}	263	}
		264
		265	=item cf::async { BLOCK }
		266
		267	Currently the same as Coro::async_pool, meaning you cannot use
		268	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
		269	thing you are allowed to do is call C<prio> on it.
		270
		271	=cut
		272
		273	BEGIN { *async = \&Coro::async_pool }
271		274
272	=item cf::sync_job { BLOCK }	275	=item cf::sync_job { BLOCK }
273		276
274	The design of crossfire+ requires that the main coro ($Coro::main) is	277	The design of crossfire+ requires that the main coro ($Coro::main) is
275	always able to handle events or runnable, as crossfire+ is only partly	278	always able to handle events or runnable, as crossfire+ is only partly
…		…
294	my $freeze_guard = freeze_mainloop;	297	my $freeze_guard = freeze_mainloop;
295		298
296	my $busy = 1;	299	my $busy = 1;
297	my @res;	300	my @res;
298		301
299	(Coro::async {	302	(async {
300	@res = eval { $job->() };	303	@res = eval { $job->() };
301	warn $@ if $@;	304	warn $@ if $@;
302	undef $busy;	305	undef $busy;
303	})->prio (Coro::PRIO_MAX);	306	})->prio (Coro::PRIO_MAX);
304		307
305	while ($busy) {	308	while ($busy) {
306	Coro::cede_notself;	309	Coro::cede or Event::one_event;
307	Event::one_event unless Coro::nready;
308	}	310	}
309		311
310	wantarray ? @res : $res[0]	312	wantarray ? @res : $res[0]
311	} else {	313	} else {
312	# we are in another coroutine, how wonderful, everything just works	314	# we are in another coroutine, how wonderful, everything just works
313		315
314	$job->()	316	$job->()
315	}	317	}
316	}	318	}
317		319
318	=item $coro = cf::coro { BLOCK }	320	=item $coro = cf::async_ext { BLOCK }
319		321
320	Creates and returns a new coro. This coro is automcatially being canceled	322	Like async, but this coro is automatically being canceled when the
321	when the extension calling this is being unloaded.	323	extension calling this is being unloaded.
322		324
323	=cut	325	=cut
324		326
325	sub coro(&) {	327	sub async_ext(&) {
326	my $cb = shift;	328	my $cb = shift;
327		329
328	my $coro = &cf::async ($cb);	330	my $coro = &Coro::async ($cb);
329		331
330	$coro->on_destroy (sub {	332	$coro->on_destroy (sub {
331	delete $EXT_CORO{$coro+0};	333	delete $EXT_CORO{$coro+0};
332	});	334	});
333	$EXT_CORO{$coro+0} = $coro;	335	$EXT_CORO{$coro+0} = $coro;
…		…
362	=cut	364	=cut
363		365
364	#############################################################################	366	#############################################################################
365		367
366	package cf::path;	368	package cf::path;
		369
		370	use overload
		371	'""' => \&as_string;
		372
		373	# used to convert map paths into valid unix filenames by repalcing / by ∕
		374	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
367		375
368	sub new {	376	sub new {
369	my ($class, $path, $base) = @_;	377	my ($class, $path, $base) = @_;
370		378
371	$path = $path->as_string if ref $path;	379	$path = $path->as_string if ref $path;
…		…
377	# ?random/... random maps	385	# ?random/... random maps
378	# /! non-realised random map exit	386	# /! non-realised random map exit
379	# /... normal maps	387	# /... normal maps
380	# ~/... per-player maps without a specific player (DO NOT USE)	388	# ~/... per-player maps without a specific player (DO NOT USE)
381	# ~user/... per-player map of a specific user	389	# ~user/... per-player map of a specific user
		390
		391	$path =~ s/$PATH_SEP/\//go;
382		392
383	if ($path =~ /^{/) {	393	if ($path =~ /^{/) {
384	# fine as it is	394	# fine as it is
385	} elsif ($path =~ s{^\?random/}{}) {	395	} elsif ($path =~ s{^\?random/}{}) {
386	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;	396	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
…		…
435	# }	445	# }
436	}	446	}
437		447
438	# escape the /'s in the path	448	# escape the /'s in the path
439	sub _escaped_path {	449	sub _escaped_path {
440	# ∕ is U+2215
441	(my $path = $_[0]{path}) =~ s/\//∕/g;	450	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
442	$path	451	$path
443	}	452	}
444		453
445	# the original (read-only) location	454	# the original (read-only) location
446	sub load_path {	455	sub load_path {
…		…
934	=cut	943	=cut
935		944
936	sub register_extcmd {	945	sub register_extcmd {
937	my ($name, $cb) = @_;	946	my ($name, $cb) = @_;
938		947
939	my $caller = caller;
940	#warn "registering extcmd '$name' to '$caller'";
941
942	$EXTCMD{$name} = [$cb, $caller];	948	$EXTCMD{$name} = $cb;
943	}	949	}
944		950
945	cf::player->attach (	951	cf::player->attach (
946	on_command => sub {	952	on_command => sub {
947	my ($pl, $name, $params) = @_;	953	my ($pl, $name, $params) = @_;
…		…
960		966
961	my $msg = eval { from_json $buf };	967	my $msg = eval { from_json $buf };
962		968
963	if (ref $msg) {	969	if (ref $msg) {
964	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	970	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
965	if (my %reply = $cb->[0]->($pl, $msg)) {	971	if (my %reply = $cb->($pl, $msg)) {
966	$pl->ext_reply ($msg->{msgid}, %reply);	972	$pl->ext_reply ($msg->{msgid}, %reply);
967	}	973	}
968	}	974	}
969	} else {	975	} else {
970	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	976	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
972		978
973	cf::override;	979	cf::override;
974	},	980	},
975	);	981	);
976		982
977	sub register {
978	my ($base, $pkg) = @_;
979
980	#TODO
981	}
982
983	sub load_extension {	983	sub load_extension {
984	my ($path) = @_;	984	my ($path) = @_;
985		985
986	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	986	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
987	my $base = $1;	987	my $base = $1;
…		…
1002		1002
1003	eval $source	1003	eval $source
1004	or die $@ ? "$path: $@\n"	1004	or die $@ ? "$path: $@\n"
1005	: "extension disabled.\n";	1005	: "extension disabled.\n";
1006		1006
1007	push @exts, $pkg;	1007	push @EXTS, $pkg;
1008	$ext_pkg{$base} = $pkg;
1009
1010	# no strict 'refs';
1011	# @{"$pkg\::ISA"} = ext::;
1012
1013	register $base, $pkg;
1014	}
1015
1016	sub unload_extension {
1017	my ($pkg) = @_;
1018
1019	warn "removing extension $pkg\n";
1020
1021	# remove hooks
1022	#TODO
1023	# for my $idx (0 .. $#PLUGIN_EVENT) {
1024	# delete $hook[$idx]{$pkg};
1025	# }
1026
1027	# remove commands
1028	for my $name (keys %COMMAND) {
1029	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1030
1031	if (@cb) {
1032	$COMMAND{$name} = \@cb;
1033	} else {
1034	delete $COMMAND{$name};
1035	}
1036	}
1037
1038	# remove extcmds
1039	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1040	delete $EXTCMD{$name};
1041	}
1042
1043	if (my $cb = $pkg->can ("unload")) {
1044	eval {
1045	$cb->($pkg);
1046	1
1047	} or warn "$pkg unloaded, but with errors: $@";
1048	}
1049
1050	Symbol::delete_package $pkg;
1051	}	1008	}
1052		1009
1053	sub load_extensions {	1010	sub load_extensions {
1054	for my $ext (<$LIBDIR/*.ext>) {	1011	for my $ext (<$LIBDIR/*.ext>) {
1055	next unless -r $ext;	1012	next unless -r $ext;
…		…
1073	};	1030	};
1074		1031
1075	cf::map->attach (prio => -10000, package => cf::mapsupport::);	1032	cf::map->attach (prio => -10000, package => cf::mapsupport::);
1076		1033
1077	#############################################################################	1034	#############################################################################
1078	# load/save perl data associated with player->ob objects
1079
1080	sub all_objects(@) {
1081	@_, map all_objects ($_->inv), @_
1082	}
1083
1084	# TODO: compatibility cruft, remove when no longer needed
1085	cf::player->attach (
1086	on_load => sub {
1087	my ($pl, $path) = @_;
1088
1089	for my $o (all_objects $pl->ob) {
1090	if (my $value = $o->get_ob_key_value ("_perl_data")) {
1091	$o->set_ob_key_value ("_perl_data");
1092
1093	%$o = %{ Storable::thaw pack "H*", $value };
1094	}
1095	}
1096	},
1097	);
1098
1099	#############################################################################
1100		1035
1101	=head2 CORE EXTENSIONS	1036	=head2 CORE EXTENSIONS
1102		1037
1103	Functions and methods that extend core crossfire objects.	1038	Functions and methods that extend core crossfire objects.
1104		1039
		1040	=cut
		1041
		1042	package cf::player;
		1043
		1044	use Coro::AIO;
		1045
1105	=head3 cf::player	1046	=head3 cf::player
1106		1047
1107	=over 4	1048	=over 4
1108		1049
1109	=item cf::player::exists $login	1050	=item cf::player::find $login
1110		1051
1111	Returns true when the given account exists.	1052	Returns the given player object, loading it if necessary (might block).
1112		1053
1113	=cut	1054	=cut
1114		1055
1115	sub cf::player::exists($) {	1056	sub playerdir($) {
1116	cf::player::find $_[0]	1057	cf::localdir
1117	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	1058	. "/"
		1059	. cf::playerdir
		1060	. "/"
		1061	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		1062	}
		1063
		1064	sub path($) {
		1065	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		1066
		1067	(playerdir $login) . "/$login.pl"
		1068	}
		1069
		1070	sub find_active($) {
		1071	$cf::PLAYER{$_[0]}
		1072	and $cf::PLAYER{$_[0]}->active
		1073	and $cf::PLAYER{$_[0]}
		1074	}
		1075
		1076	sub exists($) {
		1077	my ($login) = @_;
		1078
		1079	$cf::PLAYER{$login}
		1080	or cf::sync_job { !aio_stat $login }
		1081	}
		1082
		1083	sub find($) {
		1084	return $cf::PLAYER{$_[0]} \|\| do {
		1085	my $login = $_[0];
		1086
		1087	my $guard = cf::lock_acquire "user_find:$login";
		1088
		1089	$cf::PLAYER{$_[0]} \|\| do {
		1090	my $pl = load_pl path $login
		1091	or return;
		1092	$cf::PLAYER{$login} = $pl
		1093	}
		1094	}
		1095	}
		1096
		1097	sub save($) {
		1098	my ($pl) = @_;
		1099
		1100	return if $pl->{deny_save};
		1101
		1102	my $path = path $pl;
		1103	my $guard = cf::lock_acquire "user_save:$path";
		1104
		1105	return if $pl->{deny_save};
		1106
		1107	aio_mkdir playerdir $pl, 0770;
		1108	$pl->{last_save} = $cf::RUNTIME;
		1109
		1110	$pl->save_pl ($path);
		1111	Coro::cede;
		1112	}
		1113
		1114	sub new($) {
		1115	my ($login) = @_;
		1116
		1117	my $self = create;
		1118
		1119	$self->ob->name ($login);
		1120	$self->{deny_save} = 1;
		1121
		1122	$cf::PLAYER{$login} = $self;
		1123
		1124	$self
		1125	}
		1126
		1127	=item $pl->quit_character
		1128
		1129	Nukes the player without looking back. If logged in, the connection will
		1130	be destroyed. May block for a long time.
		1131
		1132	=cut
		1133
		1134	sub quit_character {
		1135	my ($pl) = @_;
		1136
		1137	$pl->{deny_save} = 1;
		1138	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1139
		1140	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1141	$pl->deactivate;
		1142	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1143	$pl->ns->destroy if $pl->ns;
		1144
		1145	my $path = playerdir $pl;
		1146	my $temp = "$path~$cf::RUNTIME~deleting~";
		1147	aio_rename $path, $temp;
		1148	delete $cf::PLAYER{$pl->ob->name};
		1149	$pl->destroy;
		1150	IO::AIO::aio_rmtree $temp;
		1151	}
		1152
		1153	=item cf::player::list_logins
		1154
		1155	Returns am arrayref of all valid playernames in the system, can take a
		1156	while and may block, so not sync_job-capable, ever.
		1157
		1158	=cut
		1159
		1160	sub list_logins {
		1161	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
		1162	or return [];
		1163
		1164	my @logins;
		1165
		1166	for my $login (@$dirs) {
		1167	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
		1168	aio_read $fh, 0, 512, my $buf, 0 or next;
		1169	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1170
		1171	utf8::decode $login;
		1172	push @logins, $login;
		1173	}
		1174
		1175	\@logins
		1176	}
		1177
		1178	=item $player->maps
		1179
		1180	Returns an arrayref of cf::path's of all maps that are private for this
		1181	player. May block.
		1182
		1183	=cut
		1184
		1185	sub maps($) {
		1186	my ($pl) = @_;
		1187
		1188	my $files = aio_readdir playerdir $pl
		1189	or return;
		1190
		1191	my @paths;
		1192
		1193	for (@$files) {
		1194	utf8::decode $_;
		1195	next if /\.(?:pl\|pst)$/;
		1196	next unless /^$PATH_SEP/o;
		1197
		1198	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
		1199	}
		1200
		1201	\@paths
1118	}	1202	}
1119		1203
1120	=item $player->ext_reply ($msgid, $msgtype, %msg)	1204	=item $player->ext_reply ($msgid, $msgtype, %msg)
1121		1205
1122	Sends an ext reply to the player.	1206	Sends an ext reply to the player.
1123		1207
1124	=cut	1208	=cut
1125		1209
1126	sub cf::player::ext_reply($$$%) {	1210	sub ext_reply($$$%) {
1127	my ($self, $id, %msg) = @_;	1211	my ($self, $id, %msg) = @_;
1128		1212
1129	$msg{msgid} = $id;	1213	$msg{msgid} = $id;
1130		1214
1131	$self->send ("ext " . to_json \%msg);	1215	$self->send ("ext " . cf::to_json \%msg);
1132	}	1216	}
		1217
		1218	package cf;
1133		1219
1134	=back	1220	=back
1135		1221
1136		1222
1137	=head3 cf::map	1223	=head3 cf::map
…		…
1184	or return;	1270	or return;
1185		1271
1186	my $map = cf::map::new	1272	my $map = cf::map::new
1187	or return;	1273	or return;
1188		1274
		1275	# for better error messages only, will be overwritten
		1276	$map->path ($path);
		1277
1189	$map->load_header ($path)	1278	$map->load_header ($path)
1190	or return;	1279	or return;
1191		1280
1192	$map->{load_path} = $path;	1281	$map->{load_path} = $path;
1193		1282
…		…
1300	Coro::cede;	1389	Coro::cede;
1301		1390
1302	$self->in_memory (cf::MAP_IN_MEMORY);	1391	$self->in_memory (cf::MAP_IN_MEMORY);
1303	}	1392	}
1304		1393
		1394	# find and load all maps in the 3x3 area around a map
		1395	sub load_diag {
		1396	my ($map) = @_;
		1397
		1398	my @diag; # diagonal neighbours
		1399
		1400	for (0 .. 3) {
		1401	my $neigh = $map->tile_path ($_)
		1402	or next;
		1403	$neigh = find $neigh, $map
		1404	or next;
		1405	$neigh->load;
		1406
		1407	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
		1408	[$neigh->tile_path (($_ + 1) % 4), $neigh];
		1409	}
		1410
		1411	for (@diag) {
		1412	my $neigh = find @$_
		1413	or next;
		1414	$neigh->load;
		1415	}
		1416	}
		1417
1305	sub find_sync {	1418	sub find_sync {
1306	my ($path, $origin) = @_;	1419	my ($path, $origin) = @_;
1307		1420
1308	cf::sync_job { cf::map::find $path, $origin }	1421	cf::sync_job { find $path, $origin }
1309	}	1422	}
1310		1423
1311	sub do_load_sync {	1424	sub do_load_sync {
1312	my ($map) = @_;	1425	my ($map) = @_;
1313		1426
1314	cf::sync_job { $map->load };	1427	cf::sync_job { $map->load };
1315	}	1428	}
1316		1429
		1430	our %MAP_PREFETCH;
		1431	our $MAP_PREFETCHER = Coro::async {
		1432	while () {
		1433	while (%MAP_PREFETCH) {
		1434	my $key = each %MAP_PREFETCH
		1435	or next;
		1436	my $path = delete $MAP_PREFETCH{$key};
		1437
		1438	my $map = find $path
		1439	or next;
		1440	$map->load;
		1441	}
		1442	Coro::schedule;
		1443	}
		1444	};
		1445
		1446	sub find_async {
		1447	my ($path, $origin) = @_;
		1448
		1449	$path = new cf::path $path, $origin && $origin->path;
		1450	my $key = $path->as_string;
		1451
		1452	if (my $map = $cf::MAP{$key}) {
		1453	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
		1454	}
		1455
		1456	$MAP_PREFETCH{$key} = $path;
		1457	$MAP_PREFETCHER->ready;
		1458
		1459	()
		1460	}
		1461
1317	sub save {	1462	sub save {
1318	my ($self) = @_;	1463	my ($self) = @_;
1319		1464
		1465	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1466
1320	$self->{last_save} = $cf::RUNTIME;	1467	$self->{last_save} = $cf::RUNTIME;
1321		1468
1322	return unless $self->dirty;	1469	return unless $self->dirty;
1323		1470
1324	my $save = $self->{path}->save_path; utf8::encode $save;	1471	my $save = $self->{path}->save_path; utf8::encode $save;
…		…
1327	$self->{load_path} = $save;	1474	$self->{load_path} = $save;
1328		1475
1329	return if $self->{deny_save};	1476	return if $self->{deny_save};
1330		1477
1331	local $self->{last_access} = $self->last_access;#d#	1478	local $self->{last_access} = $self->last_access;#d#
		1479
		1480	cf::async {
		1481	$_->contr->save for $self->players;
		1482	};
1332		1483
1333	if ($uniq) {	1484	if ($uniq) {
1334	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	1485	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
1335	$self->save_objects ($uniq, cf::IO_UNIQUES);	1486	$self->save_objects ($uniq, cf::IO_UNIQUES);
1336	} else {	1487	} else {
…		…
1342	my ($self) = @_;	1493	my ($self) = @_;
1343		1494
1344	# save first because save cedes	1495	# save first because save cedes
1345	$self->save;	1496	$self->save;
1346		1497
		1498	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1499
1347	return if $self->players;	1500	return if $self->players;
1348	return if $self->in_memory != cf::MAP_IN_MEMORY;	1501	return if $self->in_memory != cf::MAP_IN_MEMORY;
1349	return if $self->{deny_save};	1502	return if $self->{deny_save};
1350		1503
1351	$self->clear;	1504	$self->clear;
…		…
1393	}	1546	}
1394		1547
1395	sub reset {	1548	sub reset {
1396	my ($self) = @_;	1549	my ($self) = @_;
1397		1550
		1551	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1552
1398	return if $self->players;	1553	return if $self->players;
1399	return if $self->{path}{user_rel};#d#	1554	return if $self->{path}{user_rel};#d#
1400		1555
1401	warn "resetting map ", $self->path;#d#	1556	warn "resetting map ", $self->path;#d#
1402		1557
…		…
1427	}	1582	}
1428		1583
1429	$map	1584	$map
1430	}	1585	}
1431		1586
1432	sub emergency_save {	1587	=item cf::map::unique_maps
1433	my $freeze_guard = cf::freeze_mainloop;
1434		1588
1435	warn "enter emergency map save\n";	1589	Returns an arrayref of cf::path's of all shared maps that have
		1590	instantiated unique items. May block.
1436		1591
1437	cf::sync_job {	1592	=cut
1438	warn "begin emergency map save\n";	1593
1439	$_->save for values %cf::MAP;	1594	sub unique_maps() {
		1595	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1596	or return;
		1597
		1598	my @paths;
		1599
		1600	for (@$files) {
		1601	utf8::decode $_;
		1602	next if /\.pst$/;
		1603	next unless /^$PATH_SEP/o;
		1604
		1605	push @paths, new cf::path $_;
1440	};	1606	}
1441		1607
1442	warn "end emergency map save\n";	1608	\@paths
1443	}	1609	}
1444		1610
1445	package cf;	1611	package cf;
1446		1612
1447	=back	1613	=back
1448		1614
		1615	=head3 cf::object
		1616
		1617	=cut
		1618
		1619	package cf::object;
		1620
		1621	=over 4
		1622
		1623	=item $ob->inv_recursive
		1624
		1625	Returns the inventory of the object _and_ their inventories, recursively.
		1626
		1627	=cut
		1628
		1629	sub inv_recursive_;
		1630	sub inv_recursive_ {
		1631	map { $_, inv_recursive_ $_->inv } @_
		1632	}
		1633
		1634	sub inv_recursive {
		1635	inv_recursive_ inv $_[0]
		1636	}
		1637
		1638	package cf;
		1639
		1640	=back
1449		1641
1450	=head3 cf::object::player	1642	=head3 cf::object::player
1451		1643
1452	=over 4	1644	=over 4
1453		1645
…		…
1545	# use -1 or undef as default coordinates, not 0, 0	1737	# use -1 or undef as default coordinates, not 0, 0
1546	($x, $y) = ($map->enter_x, $map->enter_y)	1738	($x, $y) = ($map->enter_x, $map->enter_y)
1547	if $x <=0 && $y <= 0;	1739	if $x <=0 && $y <= 0;
1548		1740
1549	$map->load;	1741	$map->load;
		1742	$map->load_diag;
1550		1743
		1744	return unless $self->contr->active;
1551	$self->activate_recursive;	1745	$self->activate_recursive;
1552	$self->enter_map ($map, $x, $y);	1746	$self->enter_map ($map, $x, $y);
1553	}	1747	}
1554		1748
1555	cf::player->attach (	1749	cf::player->attach (
…		…
1568		1762
1569	# try to abort aborted map switching on player login :)	1763	# try to abort aborted map switching on player login :)
1570	# should happen only on crashes	1764	# should happen only on crashes
1571	if ($pl->ob->{_link_pos}) {	1765	if ($pl->ob->{_link_pos}) {
1572	$pl->ob->enter_link;	1766	$pl->ob->enter_link;
1573	cf::async {	1767	(async {
1574	# we need this sleep as the login has a concurrent enter_exit running	1768	# we need this sleep as the login has a concurrent enter_exit running
1575	# and this sleep increases chances of the player not ending up in scorn	1769	# and this sleep increases chances of the player not ending up in scorn
		1770	$pl->ob->reply (undef,
		1771	"There was an internal problem at your last logout, "
		1772	. "the server will try to bring you to your intended destination in a second.",
		1773	cf::NDI_RED);
1576	Coro::Timer::sleep 1;	1774	Coro::Timer::sleep 1;
1577	$pl->ob->leave_link;	1775	$pl->ob->leave_link;
1578	};	1776	})->prio (2);
1579	}	1777	}
1580	},	1778	},
1581	);	1779	);
1582		1780
1583	=item $player_object->goto_map ($path, $x, $y)	1781	=item $player_object->goto ($path, $x, $y)
1584		1782
1585	=cut	1783	=cut
1586		1784
1587	sub cf::object::player::goto_map {	1785	sub cf::object::player::goto {
1588	my ($self, $path, $x, $y) = @_;	1786	my ($self, $path, $x, $y) = @_;
1589		1787
		1788	$path = new cf::path $path;
		1789
1590	$self->enter_link;	1790	$self->enter_link;
1591		1791
1592	(cf::async {	1792	(async {
1593	$path = new cf::path $path;
1594
1595	my $map = cf::map::find $path->as_string;	1793	my $map = cf::map::find $path->as_string;
1596	$map = $map->customise_for ($self) if $map;	1794	$map = $map->customise_for ($self) if $map;
1597		1795
1598	# warn "entering ", $map->path, " at ($x, $y)\n"	1796	# warn "entering ", $map->path, " at ($x, $y)\n"
1599	# if $map;	1797	# if $map;
1600		1798
1601	$map or $self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	1799	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1602		1800
1603	$self->leave_link ($map, $x, $y);	1801	$self->leave_link ($map, $x, $y);
1604	})->prio (1);	1802	})->prio (1);
1605	}	1803	}
1606		1804
…		…
1659		1857
1660	return unless $self->type == cf::PLAYER;	1858	return unless $self->type == cf::PLAYER;
1661		1859
1662	$self->enter_link;	1860	$self->enter_link;
1663		1861
1664	(cf::async {	1862	(async {
1665	$self->deactivate_recursive; # just to be sure	1863	$self->deactivate_recursive; # just to be sure
1666	unless (eval {	1864	unless (eval {
1667	prepare_random_map $exit	1865	prepare_random_map $exit
1668	if $exit->slaying eq "/!";	1866	if $exit->slaying eq "/!";
1669		1867
1670	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;	1868	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1671	$self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);	1869	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1672		1870
1673	1;	1871	1;
1674	}) {	1872	}) {
1675	$self->message ("Something went wrong deep within the crossfire server. "	1873	$self->message ("Something went wrong deep within the crossfire server. "
1676	. "I'll try to bring you back to the map you were before. "	1874	. "I'll try to bring you back to the map you were before. "
1677	. "Please report this to the dungeon master",	1875	. "Please report this to the dungeon master!",
1678	cf::NDI_UNIQUE \| cf::NDI_RED);	1876	cf::NDI_UNIQUE \| cf::NDI_RED);
1679		1877
1680	warn "ERROR in enter_exit: $@";	1878	warn "ERROR in enter_exit: $@";
1681	$self->leave_link;	1879	$self->leave_link;
1682	}	1880	}
…		…
1750	}	1948	}
1751	}	1949	}
1752	},	1950	},
1753	);	1951	);
1754		1952
1755	=item $client->coro (\&cb)	1953	=item $client->async (\&cb)
1756		1954
1757	Create a new coroutine, running the specified callback. The coroutine will	1955	Create a new coroutine, running the specified callback. The coroutine will
1758	be automatically cancelled when the client gets destroyed (e.g. on logout,	1956	be automatically cancelled when the client gets destroyed (e.g. on logout,
1759	or loss of connection).	1957	or loss of connection).
1760		1958
1761	=cut	1959	=cut
1762		1960
1763	sub cf::client::coro {	1961	sub cf::client::async {
1764	my ($self, $cb) = @_;	1962	my ($self, $cb) = @_;
1765		1963
1766	my $coro = &cf::async ($cb);	1964	my $coro = &Coro::async ($cb);
1767		1965
1768	$coro->on_destroy (sub {	1966	$coro->on_destroy (sub {
1769	delete $self->{_coro}{$coro+0};	1967	delete $self->{_coro}{$coro+0};
1770	});	1968	});
1771		1969
…		…
2009	local $/;	2207	local $/;
2010	*CFG = YAML::Syck::Load <$fh>;	2208	*CFG = YAML::Syck::Load <$fh>;
2011		2209
2012	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	2210	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
2013		2211
		2212	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2213	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2214
2014	if (exists $CFG{mlockall}) {	2215	if (exists $CFG{mlockall}) {
2015	eval {	2216	eval {
2016	$CFG{mlockall} ? &mlockall : &munlockall	2217	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2017	and die "WARNING: m(un)lockall failed: $!\n";	2218	and die "WARNING: m(un)lockall failed: $!\n";
2018	};	2219	};
2019	warn $@ if $@;	2220	warn $@ if $@;
2020	}	2221	}
2021	}	2222	}
2022		2223
2023	sub main {	2224	sub main {
2024	# we must not ever block the main coroutine	2225	# we must not ever block the main coroutine
2025	local $Coro::idle = sub {	2226	local $Coro::idle = sub {
2026	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2227	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2027	(Coro::unblock_sub {
2028	Event::one_event;	2228	async { Event::one_event };
2029	})->();
2030	};	2229	};
2031		2230
2032	cfg_load;	2231	cfg_load;
2033	db_load;	2232	db_load;
2034	load_extensions;	2233	load_extensions;
2035	Event::loop;	2234	Event::loop;
2036	}	2235	}
2037		2236
2038	#############################################################################	2237	#############################################################################
2039	# initialisation	2238	# initialisation and cleanup
		2239
		2240	# install some emergency cleanup handlers
		2241	BEGIN {
		2242	for my $signal (qw(INT HUP TERM)) {
		2243	Event->signal (
		2244	data => WF_AUTOCANCEL,
		2245	signal => $signal,
		2246	cb => sub {
		2247	cf::cleanup "SIG$signal";
		2248	},
		2249	);
		2250	}
		2251	}
		2252
		2253	sub emergency_save() {
		2254	my $freeze_guard = cf::freeze_mainloop;
		2255
		2256	warn "enter emergency perl save\n";
		2257
		2258	cf::sync_job {
		2259	# use a peculiar iteration method to avoid tripping on perl
		2260	# refcount bugs in for. also avoids problems with players
		2261	# and maps saved/Destroyed asynchronously.
		2262	warn "begin emergency player save\n";
		2263	for my $login (keys %cf::PLAYER) {
		2264	my $pl = $cf::PLAYER{$login} or next;
		2265	$pl->valid or next;
		2266	$pl->save;
		2267	}
		2268	warn "end emergency player save\n";
		2269
		2270	warn "begin emergency map save\n";
		2271	for my $path (keys %cf::MAP) {
		2272	my $map = $cf::MAP{$path} or next;
		2273	$map->valid or next;
		2274	$map->save;
		2275	}
		2276	warn "end emergency map save\n";
		2277	};
		2278
		2279	warn "leave emergency perl save\n";
		2280	}
2040		2281
2041	sub reload() {	2282	sub reload() {
2042	# can/must only be called in main	2283	# can/must only be called in main
2043	if ($Coro::current != $Coro::main) {	2284	if ($Coro::current != $Coro::main) {
2044	warn "can only reload from main coroutine\n";	2285	warn "can only reload from main coroutine\n";
2045	return;	2286	return;
2046	}	2287	}
2047		2288
2048	warn "reloading...";	2289	warn "reloading...";
2049		2290
		2291	warn "freezing server";
2050	my $guard = freeze_mainloop;	2292	my $guard = freeze_mainloop;
2051	cf::emergency_save;	2293	cf::emergency_save;
2052		2294
		2295	warn "sync database to disk";
		2296	cf::db_sync;
		2297	IO::AIO::flush;
		2298
2053	eval {	2299	eval {
2054	# if anything goes wrong in here, we should simply crash as we already saved	2300	# if anything goes wrong in here, we should simply crash as we already saved
2055		2301
2056	# cancel all watchers	2302	warn "cancel all watchers";
2057	for (Event::all_watchers) {	2303	for (Event::all_watchers) {
2058	$_->cancel if $_->data & WF_AUTOCANCEL;	2304	$_->cancel if $_->data & WF_AUTOCANCEL;
2059	}	2305	}
2060		2306
2061	# cancel all extension coros	2307	warn "cancel all extension coros";
2062	$_->cancel for values %EXT_CORO;	2308	$_->cancel for values %EXT_CORO;
2063	%EXT_CORO = ();	2309	%EXT_CORO = ();
2064		2310
		2311	warn "remove commands";
		2312	%COMMAND = ();
		2313
		2314	warn "remove ext commands";
		2315	%EXTCMD = ();
		2316
2065	# unload all extensions	2317	warn "unload/nuke all extensions";
2066	for (@exts) {	2318	for my $pkg (@EXTS) {
2067	warn "unloading <$_>";	2319	warn "unloading <$pkg>";
2068	unload_extension $_;	2320
		2321	if (my $cb = $pkg->can ("unload")) {
		2322	eval {
		2323	$cb->($pkg);
		2324	1
		2325	} or warn "$pkg unloaded, but with errors: $@";
2069	}	2326	}
2070		2327
		2328	Symbol::delete_package $pkg;
		2329	}
		2330
2071	# unload all modules loaded from $LIBDIR	2331	warn "unload all perl modules loaded from $LIBDIR";
2072	while (my ($k, $v) = each %INC) {	2332	while (my ($k, $v) = each %INC) {
2073	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2333	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2074		2334
2075	warn "removing <$k>";	2335	warn "removing <$k>";
2076	delete $INC{$k};	2336	delete $INC{$k};
…		…
2083	}	2343	}
2084		2344
2085	Symbol::delete_package $k;	2345	Symbol::delete_package $k;
2086	}	2346	}
2087		2347
2088	# sync database to disk
2089	cf::db_sync;
2090	IO::AIO::flush;
2091
2092	# get rid of safe::, as good as possible	2348	warn "get rid of safe::, as good as possible";
2093	Symbol::delete_package "safe::$_"	2349	Symbol::delete_package "safe::$_"
2094	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2350	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2095		2351
2096	# remove register_script_function callbacks
2097	# TODO
2098
2099	# unload cf.pm "a bit"	2352	warn "unload cf.pm \"a bit\"";
2100	delete $INC{"cf.pm"};	2353	delete $INC{"cf.pm"};
2101		2354
2102	# don't, removes xs symbols, too,	2355	# don't, removes xs symbols, too,
2103	# and global variables created in xs	2356	# and global variables created in xs
2104	#Symbol::delete_package __PACKAGE__;	2357	#Symbol::delete_package __PACKAGE__;
2105		2358
2106	# reload cf.pm
2107	warn "reloading cf.pm";	2359	warn "reloading cf.pm";
2108	require cf;	2360	require cf;
2109	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2361	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2110		2362
2111	# load config and database again	2363	warn "load config and database again";
2112	cf::cfg_load;	2364	cf::cfg_load;
2113	cf::db_load;	2365	cf::db_load;
2114		2366
2115	# load extensions
2116	warn "load extensions";	2367	warn "load extensions";
2117	cf::load_extensions;	2368	cf::load_extensions;
2118		2369
2119	# reattach attachments to objects	2370	warn "reattach attachments to objects/players";
2120	warn "reattach";
2121	_global_reattach;	2371	_global_reattach;
		2372	warn "reattach attachments to maps";
		2373	reattach $_ for values %MAP;
2122	};	2374	};
2123		2375
2124	if ($@) {	2376	if ($@) {
2125	warn $@;	2377	warn $@;
2126	warn "error while reloading, exiting.";	2378	warn "error while reloading, exiting.";
2127	exit 1;	2379	exit 1;
2128	}	2380	}
2129		2381
2130	warn "reloaded successfully";	2382	warn "reloaded";
2131	};	2383	};
2132		2384
2133	#############################################################################	2385	#############################################################################
2134		2386
2135	unless ($LINK_MAP) {	2387	unless ($LINK_MAP) {
…		…
2142	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";	2394	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2143	$LINK_MAP->in_memory (MAP_IN_MEMORY);	2395	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2144		2396
2145	# dirty hack because... archetypes are not yet loaded	2397	# dirty hack because... archetypes are not yet loaded
2146	Event->timer (	2398	Event->timer (
2147	after => 2,	2399	after => 10,
2148	cb => sub {	2400	cb => sub {
2149	$_[0]->w->cancel;	2401	$_[0]->w->cancel;
2150		2402
2151	# provide some exits "home"	2403	# provide some exits "home"
2152	my $exit = cf::object::new "exit";	2404	my $exit = cf::object::new "exit";
…		…
2170	$LINK_MAP->{deny_save} = 1;	2422	$LINK_MAP->{deny_save} = 1;
2171	$LINK_MAP->{deny_reset} = 1;	2423	$LINK_MAP->{deny_reset} = 1;
2172		2424
2173	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;	2425	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2174	}	2426	}
2175
2176	register "<global>", __PACKAGE__;
2177		2427
2178	register_command "reload" => sub {	2428	register_command "reload" => sub {
2179	my ($who, $arg) = @_;	2429	my ($who, $arg) = @_;
2180		2430
2181	if ($who->flag (FLAG_WIZ)) {	2431	if ($who->flag (FLAG_WIZ)) {
…		…
2194	data => WF_AUTOCANCEL,	2444	data => WF_AUTOCANCEL,
2195	cb => sub {	2445	cb => sub {
2196	cf::server_tick; # one server iteration	2446	cf::server_tick; # one server iteration
2197	$RUNTIME += $TICK;	2447	$RUNTIME += $TICK;
2198	$NEXT_TICK += $TICK;	2448	$NEXT_TICK += $TICK;
		2449
		2450	$WAIT_FOR_TICK->broadcast;
		2451	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2199		2452
2200	# if we are delayed by four ticks or more, skip them all	2453	# if we are delayed by four ticks or more, skip them all
2201	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2454	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2202		2455
2203	$TICK_WATCHER->at ($NEXT_TICK);	2456	$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.134 by root, Thu Jan 4 17:28:49 2007 UTC vs. Revision 1.159 by root, Wed Jan 10 22:50:12 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.134 by root, Thu Jan 4 17:28:49 2007 UTC vs.
Revision 1.159 by root, Wed Jan 10 22:50:12 2007 UTC