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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.130 by root, Thu Jan 4 00:08:08 2007 UTC vs.
Revision 1.163 by root, Thu Jan 11 01:01:56 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
		42	our %EXT_MAP = (); # pluggable maps
38		43
39	our @EVENT;	44	our @EVENT;
40	our $LIBDIR = datadir . "/ext";	45	our $LIBDIR = datadir . "/ext";
41		46
42	our $TICK = MAX_TIME * 1e-6;	47	our $TICK = MAX_TIME * 1e-6;
…		…
47	our %CFG;	52	our %CFG;
48		53
49	our $UPTIME; $UPTIME \|\|= time;	54	our $UPTIME; $UPTIME \|\|= time;
50	our $RUNTIME;	55	our $RUNTIME;
51		56
		57	our %PLAYER; # all users
52	our %MAP; # all maps	58	our %MAP; # all maps
53	our $LINK_MAP; # the special {link} map	59	our $LINK_MAP; # the special {link} map
54	our $FREEZE;
55	our $RANDOM_MAPS = cf::localdir . "/random";	60	our $RANDOM_MAPS = cf::localdir . "/random";
56	our %EXT_CORO;	61
		62	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
		63	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
57		64
58	binmode STDOUT;	65	binmode STDOUT;
59	binmode STDERR;	66	binmode STDERR;
60		67
61	# read virtual server time, if available	68	# read virtual server time, if available
…		…
71	mkdir cf::localdir . "/" . cf::uniquedir;	78	mkdir cf::localdir . "/" . cf::uniquedir;
72	mkdir $RANDOM_MAPS;	79	mkdir $RANDOM_MAPS;
73		80
74	# a special map that is always available	81	# a special map that is always available
75	our $LINK_MAP;	82	our $LINK_MAP;
76		83	our $EMERGENCY_POSITION;
77	our $EMERGENCY_POSITION = $cf::CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
78		84
79	#############################################################################	85	#############################################################################
80		86
81	=head2 GLOBAL VARIABLES	87	=head2 GLOBAL VARIABLES
82		88
…		…
106		112
107	=item %cf::CFG	113	=item %cf::CFG
108		114
109	Configuration for the server, loaded from C</etc/crossfire/config>, or	115	Configuration for the server, loaded from C</etc/crossfire/config>, or
110	from wherever your confdir points to.	116	from wherever your confdir points to.
		117
		118	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
		119
		120	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
		121	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
		122	processing has been done. Call C<< ->wait >> on them to maximise the
		123	window of cpu time available, or simply to synchronise to the server tick.
111		124
112	=back	125	=back
113		126
114	=cut	127	=cut
115		128
…		…
119	utf8::encode $msg;	132	utf8::encode $msg;
120		133
121	$msg .= "\n"	134	$msg .= "\n"
122	unless $msg =~ /\n$/;	135	unless $msg =~ /\n$/;
123		136
124	LOG llevError, "cfperl: $msg";	137	LOG llevError, $msg;
125	};	138	};
126	}	139	}
127		140
128	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	141	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	142	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
147		160
148	$Event::DIED = sub {	161	$Event::DIED = sub {
149	warn "error in event callback: @_";	162	warn "error in event callback: @_";
150	};	163	};
151		164
152	my %ext_pkg;
153	my @exts;
154	my @hook;
155
156	=head2 UTILITY FUNCTIONS	165	=head2 UTILITY FUNCTIONS
157		166
158	=over 4	167	=over 4
159		168
		169	=item dumpval $ref
		170
160	=cut	171	=cut
		172
		173	sub dumpval {
		174	eval {
		175	local $SIG{__DIE__};
		176	my $d;
		177	if (1) {
		178	$d = new Data::Dumper([$_[0]], ["*var"]);
		179	$d->Terse(1);
		180	$d->Indent(2);
		181	$d->Quotekeys(0);
		182	$d->Useqq(1);
		183	#$d->Bless(...);
		184	$d->Seen($_[1]) if @_ > 1;
		185	$d = $d->Dump();
		186	}
		187	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
		188	$d
		189	} \|\| "[unable to dump $_[0]: '$@']";
		190	}
161		191
162	use JSON::Syck (); # TODO# replace by JSON::PC once working	192	use JSON::Syck (); # TODO# replace by JSON::PC once working
163		193
164	=item $ref = cf::from_json $json	194	=item $ref = cf::from_json $json
165		195
…		…
181	sub to_json($) {	211	sub to_json($) {
182	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	212	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183	JSON::Syck::Dump $_[0]	213	JSON::Syck::Dump $_[0]
184	}	214	}
185		215
186	=item my $guard = cf::guard { BLOCK }
187
188	Run the given callback when the guard object gets destroyed (useful for
189	coroutine cancellations).
190
191	You can call C<< ->cancel >> on the guard object to stop the block from
192	being executed.
193
194	=cut
195
196	sub guard(&) {
197	bless \(my $cb = $_[0]), cf::guard::;
198	}
199
200	sub cf::guard::cancel {
201	${$_[0]} = sub { };
202	}
203
204	sub cf::guard::DESTROY {
205	${$_[0]}->();
206	}
207
208	=item cf::lock_wait $string	216	=item cf::lock_wait $string
209		217
210	Wait until the given lock is available. See cf::lock_acquire.	218	Wait until the given lock is available. See cf::lock_acquire.
211		219
212	=item my $lock = cf::lock_acquire $string	220	=item my $lock = cf::lock_acquire $string
213		221
214	Wait until the given lock is available and then acquires it and returns	222	Wait until the given lock is available and then acquires it and returns
215	a guard object. If the guard object gets destroyed (goes out of scope,	223	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216	for example when the coroutine gets canceled), the lock is automatically	224	for example when the coroutine gets canceled), the lock is automatically
217	returned.	225	returned.
218		226
219	Lock names should begin with a unique identifier (for example, find_map	227	Lock names should begin with a unique identifier (for example, cf::map::find
220	uses map_find and load_map uses map_load).	228	uses map_find and cf::map::load uses map_load).
221		229
222	=cut	230	=cut
223		231
224	our %LOCK;	232	our %LOCK;
225		233
…		…
239	# wait, to be sure we are not locked	247	# wait, to be sure we are not locked
240	lock_wait $key;	248	lock_wait $key;
241		249
242	$LOCK{$key} = [];	250	$LOCK{$key} = [];
243		251
244	cf::guard {	252	Coro::guard {
245	# wake up all waiters, to be on the safe side	253	# wake up all waiters, to be on the safe side
246	$_->ready for @{ delete $LOCK{$key} };	254	$_->ready for @{ delete $LOCK{$key} };
247	}	255	}
248	}	256	}
249		257
		258	sub freeze_mainloop {
		259	return unless $TICK_WATCHER->is_active;
		260
		261	my $guard = Coro::guard { $TICK_WATCHER->start };
		262	$TICK_WATCHER->stop;
		263	$guard
		264	}
		265
250	=item cf::async { BLOCK }	266	=item cf::async { BLOCK }
251		267
252	Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the	268	Currently the same as Coro::async_pool, meaning you cannot use
253	error instead of exiting the server in case of a problem.	269	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
		270	thing you are allowed to do is call C<prio> on it.
254		271
255	=cut	272	=cut
256		273
257	sub async(&) {	274	BEGIN { *async = \&Coro::async_pool }
258	my ($cb) = @_;
259
260	Coro::async {
261	eval { $cb->() };
262	warn $@ if $@;
263	}
264	}
265		275
266	=item cf::sync_job { BLOCK }	276	=item cf::sync_job { BLOCK }
267		277
268	The design of crossfire+ requires that the main coro ($Coro::main) is	278	The design of crossfire+ requires that the main coro ($Coro::main) is
269	always able to handle events or runnable, as crossfire+ is only partly	279	always able to handle events or runnable, as crossfire+ is only partly
…		…
283	# this is the main coro, too bad, we have to block	293	# this is the main coro, too bad, we have to block
284	# till the operation succeeds, freezing the server :/	294	# till the operation succeeds, freezing the server :/
285		295
286	# TODO: use suspend/resume instead	296	# TODO: use suspend/resume instead
287	# (but this is cancel-safe)	297	# (but this is cancel-safe)
288	local $FREEZE = 1;	298	my $freeze_guard = freeze_mainloop;
289		299
290	my $busy = 1;	300	my $busy = 1;
291	my @res;	301	my @res;
292		302
293	(Coro::async {	303	(async {
294	@res = eval { $job->() };	304	@res = eval { $job->() };
295	warn $@ if $@;	305	warn $@ if $@;
296	undef $busy;	306	undef $busy;
297	})->prio (Coro::PRIO_MAX);	307	})->prio (Coro::PRIO_MAX);
298		308
299	while ($busy) {	309	while ($busy) {
300	Coro::cede_notself;	310	Coro::cede or Event::one_event;
301	Event::one_event unless Coro::nready;
302	}	311	}
303		312
304	wantarray ? @res : $res[0]	313	wantarray ? @res : $res[0]
305	} else {	314	} else {
306	# we are in another coroutine, how wonderful, everything just works	315	# we are in another coroutine, how wonderful, everything just works
307		316
308	$job->()	317	$job->()
309	}	318	}
310	}	319	}
311		320
312	=item $coro = cf::coro { BLOCK }	321	=item $coro = cf::async_ext { BLOCK }
313		322
314	Creates and returns a new coro. This coro is automcatially being canceled	323	Like async, but this coro is automatically being canceled when the
315	when the extension calling this is being unloaded.	324	extension calling this is being unloaded.
316		325
317	=cut	326	=cut
318		327
319	sub coro(&) {	328	sub async_ext(&) {
320	my $cb = shift;	329	my $cb = shift;
321		330
322	my $coro = &cf::async ($cb);	331	my $coro = &Coro::async ($cb);
323		332
324	$coro->on_destroy (sub {	333	$coro->on_destroy (sub {
325	delete $EXT_CORO{$coro+0};	334	delete $EXT_CORO{$coro+0};
326	});	335	});
327	$EXT_CORO{$coro+0} = $coro;	336	$EXT_CORO{$coro+0} = $coro;
…		…
357		366
358	#############################################################################	367	#############################################################################
359		368
360	package cf::path;	369	package cf::path;
361		370
		371	use overload
		372	'""' => \&as_string;
		373
		374	# used to convert map paths into valid unix filenames by repalcing / by ∕
		375	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
		376
		377	sub register {
		378	my ($pkg, $prefix) = @_;
		379
		380	$EXT_MAP{$prefix} = $pkg;
		381	}
		382
362	sub new {	383	sub new {
363	my ($class, $path, $base) = @_;	384	my ($class, $path, $base) = @_;
364		385
365	$path = $path->as_string if ref $path;	386	return $path if ref $path;
366		387
367	my $self = bless { }, $class;	388	my $self = {};
368		389
369	# {... are special paths that are not touched	390	# {... are special paths that are not being touched
370	# ?xxx/... are special absolute paths	391	# ?xxx/... are special absolute paths
371	# ?random/... random maps	392	# ?random/... random maps
372	# /! non-realised random map exit	393	# /! non-realised random map exit
373	# /... normal maps	394	# /... normal maps
374	# ~/... per-player maps without a specific player (DO NOT USE)	395	# ~/... per-player maps without a specific player (DO NOT USE)
375	# ~user/... per-player map of a specific user	396	# ~user/... per-player map of a specific user
376		397
		398	$path =~ s/$PATH_SEP/\//go;
		399
377	if ($path =~ /^{/) {	400	if ($path =~ /^{/) {
378	# fine as it is	401	# fine as it is
379	} elsif ($path =~ s{^\?random/}{}) {
380	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
381	$self->{random} = cf::from_json $data;
382	} else {	402	} else {
383	if ($path =~ s{^~([^/]+)?}{}) {	403	if ($path =~ s{^~([^/]+)?}{}) {
		404	# ~user
384	$self->{user_rel} = 1;	405	$self->{user_rel} = 1;
385		406
386	if (defined $1) {	407	if (defined $1) {
387	$self->{user} = $1;	408	$self->{user} = $1;
388	} elsif ($base =~ m{^~([^/]+)/}) {	409	} elsif ($base =~ m{^~([^/]+)/}) {
389	$self->{user} = $1;	410	$self->{user} = $1;
390	} else {	411	} else {
391	warn "cannot resolve user-relative path without user <$path,$base>\n";	412	warn "cannot resolve user-relative path without user <$path,$base>\n";
392	}	413	}
		414	} elsif ($path =~ s{^\?([^/]+)/}{}) {
		415	# ?...
		416	$self->{ext} = $1;
		417	if (my $ext = $EXT_MAP{$1}) {
		418	bless $self, $ext;
		419	}
393	} elsif ($path =~ /^\//) {	420	} elsif ($path =~ /^\//) {
		421	# /...
394	# already absolute	422	# already absolute
395	} else {	423	} else {
		424	# relative
396	$base =~ s{[^/]+/?$}{};	425	$base =~ s{[^/]+/?$}{};
397	return $class->new ("$base/$path");	426	return $class->new ("$base/$path");
398	}	427	}
399		428
400	for ($path) {	429	for ($path) {
…		…
403	}	432	}
404	}	433	}
405		434
406	$self->{path} = $path;	435	$self->{path} = $path;
407		436
		437	if ("HASH" eq ref $self) {
		438	bless $self, $class;
		439	} else {
		440	$self->init;
		441	}
		442
		443	for my $ext (values %EXT_MAP) {
		444	if (my $subst = $ext->substitute ($self)) {
		445	return $subst;
		446	}
		447	}
		448
408	$self	449	$self
		450	}
		451
		452	sub init {
		453	# nop
		454	}
		455
		456	sub substitute {
		457	()
409	}	458	}
410		459
411	# the name / primary key / in-game path	460	# the name / primary key / in-game path
412	sub as_string {	461	sub as_string {
413	my ($self) = @_;	462	my ($self) = @_;
414		463
415	$self->{user_rel} ? "~$self->{user}$self->{path}"	464	$self->{user_rel} ? "~$self->{user}$self->{path}"
416	: $self->{random} ? "?random/$self->{path}"	465	: $self->{ext} ? "?$self->{ext}/$self->{path}"
417	: $self->{path}	466	: $self->{path}
418	}	467	}
419		468
420	# the displayed name, this is a one way mapping	469	# the displayed name, this is a one way mapping
421	sub visible_name {	470	sub visible_name {
422	my ($self) = @_;	471	&as_string
423
424	# if (my $rmp = $self->{random}) {
425	# # todo: be more intelligent about this
426	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
427	# } else {
428	$self->as_string
429	# }
430	}	472	}
431		473
432	# escape the /'s in the path	474	# escape the /'s in the path
433	sub _escaped_path {	475	sub _escaped_path {
434	# ∕ is U+2215
435	(my $path = $_[0]{path}) =~ s/\//∕/g;	476	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		477
436	$path	478	$path
437	}	479	}
438		480
439	# the original (read-only) location	481	# the original (read-only) location
440	sub load_path {	482	sub load_path {
…		…
445		487
446	# the temporary/swap location	488	# the temporary/swap location
447	sub save_path {	489	sub save_path {
448	my ($self) = @_;	490	my ($self) = @_;
449		491
		492	$self->{user_rel}
450	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path	493	? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
451	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
452	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path	494	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
453	}	495	}
454		496
455	# the unique path, might be eq to save_path	497	# the unique path, undef == no special unique path
456	sub uniq_path {	498	sub uniq_path {
457	my ($self) = @_;	499	my ($self) = @_;
458		500
459	$self->{user_rel} \|\| $self->{random}
460	? undef
461	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path	501	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
462	}
463
464	# return random map parameters, or undef
465	sub random_map_params {
466	my ($self) = @_;
467
468	$self->{random}
469	}	502	}
470		503
471	# this is somewhat ugly, but style maps do need special treatment	504	# this is somewhat ugly, but style maps do need special treatment
472	sub is_style_map {	505	sub is_style_map {
473	$_[0]{path} =~ m{^/styles/}	506	$_[0]{path} =~ m{^/styles/}
		507	}
		508
		509	sub load_orig {
		510	my ($self) = @_;
		511
		512	&cf::map::load_map_header ($self->load_path)
		513	}
		514
		515	sub load_temp {
		516	my ($self) = @_;
		517
		518	&cf::map::load_map_header ($self->save_path)
474	}	519	}
475		520
476	package cf;	521	package cf;
477		522
478	#############################################################################	523	#############################################################################
…		…
928	=cut	973	=cut
929		974
930	sub register_extcmd {	975	sub register_extcmd {
931	my ($name, $cb) = @_;	976	my ($name, $cb) = @_;
932		977
933	my $caller = caller;
934	#warn "registering extcmd '$name' to '$caller'";
935
936	$EXTCMD{$name} = [$cb, $caller];	978	$EXTCMD{$name} = $cb;
937	}	979	}
938		980
939	cf::player->attach (	981	cf::player->attach (
940	on_command => sub {	982	on_command => sub {
941	my ($pl, $name, $params) = @_;	983	my ($pl, $name, $params) = @_;
…		…
954		996
955	my $msg = eval { from_json $buf };	997	my $msg = eval { from_json $buf };
956		998
957	if (ref $msg) {	999	if (ref $msg) {
958	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1000	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
959	if (my %reply = $cb->[0]->($pl, $msg)) {	1001	if (my %reply = $cb->($pl, $msg)) {
960	$pl->ext_reply ($msg->{msgid}, %reply);	1002	$pl->ext_reply ($msg->{msgid}, %reply);
961	}	1003	}
962	}	1004	}
963	} else {	1005	} else {
964	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1006	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
966		1008
967	cf::override;	1009	cf::override;
968	},	1010	},
969	);	1011	);
970		1012
971	sub register {
972	my ($base, $pkg) = @_;
973
974	#TODO
975	}
976
977	sub load_extension {	1013	sub load_extension {
978	my ($path) = @_;	1014	my ($path) = @_;
979		1015
980	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	1016	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
981	my $base = $1;	1017	my $base = $1;
982	my $pkg = $1;	1018	my $pkg = $1;
983	$pkg =~ s/[^[:word:]]/_/g;	1019	$pkg =~ s/[^[:word:]]/_/g;
984	$pkg = "ext::$pkg";	1020	$pkg = "ext::$pkg";
985		1021
986	warn "loading '$path' into '$pkg'\n";	1022	warn "... loading '$path' into '$pkg'\n";
987		1023
988	open my $fh, "<:utf8", $path	1024	open my $fh, "<:utf8", $path
989	or die "$path: $!";	1025	or die "$path: $!";
990		1026
991	my $source =	1027	my $source =
…		…
996		1032
997	eval $source	1033	eval $source
998	or die $@ ? "$path: $@\n"	1034	or die $@ ? "$path: $@\n"
999	: "extension disabled.\n";	1035	: "extension disabled.\n";
1000		1036
1001	push @exts, $pkg;	1037	push @EXTS, $pkg;
1002	$ext_pkg{$base} = $pkg;
1003
1004	# no strict 'refs';
1005	# @{"$pkg\::ISA"} = ext::;
1006
1007	register $base, $pkg;
1008	}
1009
1010	sub unload_extension {
1011	my ($pkg) = @_;
1012
1013	warn "removing extension $pkg\n";
1014
1015	# remove hooks
1016	#TODO
1017	# for my $idx (0 .. $#PLUGIN_EVENT) {
1018	# delete $hook[$idx]{$pkg};
1019	# }
1020
1021	# remove commands
1022	for my $name (keys %COMMAND) {
1023	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1024
1025	if (@cb) {
1026	$COMMAND{$name} = \@cb;
1027	} else {
1028	delete $COMMAND{$name};
1029	}
1030	}
1031
1032	# remove extcmds
1033	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1034	delete $EXTCMD{$name};
1035	}
1036
1037	if (my $cb = $pkg->can ("unload")) {
1038	eval {
1039	$cb->($pkg);
1040	1
1041	} or warn "$pkg unloaded, but with errors: $@";
1042	}
1043
1044	Symbol::delete_package $pkg;
1045	}	1038	}
1046		1039
1047	sub load_extensions {	1040	sub load_extensions {
1048	for my $ext (<$LIBDIR/*.ext>) {	1041	for my $ext (<$LIBDIR/*.ext>) {
1049	next unless -r $ext;	1042	next unless -r $ext;
…		…
1067	};	1060	};
1068		1061
1069	cf::map->attach (prio => -10000, package => cf::mapsupport::);	1062	cf::map->attach (prio => -10000, package => cf::mapsupport::);
1070		1063
1071	#############################################################################	1064	#############################################################################
1072	# load/save perl data associated with player->ob objects
1073
1074	sub all_objects(@) {
1075	@_, map all_objects ($_->inv), @_
1076	}
1077
1078	# TODO: compatibility cruft, remove when no longer needed
1079	cf::player->attach (
1080	on_load => sub {
1081	my ($pl, $path) = @_;
1082
1083	for my $o (all_objects $pl->ob) {
1084	if (my $value = $o->get_ob_key_value ("_perl_data")) {
1085	$o->set_ob_key_value ("_perl_data");
1086
1087	%$o = %{ Storable::thaw pack "H*", $value };
1088	}
1089	}
1090	},
1091	);
1092
1093	#############################################################################
1094		1065
1095	=head2 CORE EXTENSIONS	1066	=head2 CORE EXTENSIONS
1096		1067
1097	Functions and methods that extend core crossfire objects.	1068	Functions and methods that extend core crossfire objects.
1098		1069
		1070	=cut
		1071
		1072	package cf::player;
		1073
		1074	use Coro::AIO;
		1075
1099	=head3 cf::player	1076	=head3 cf::player
1100		1077
1101	=over 4	1078	=over 4
1102		1079
1103	=item cf::player::exists $login	1080	=item cf::player::find $login
1104		1081
1105	Returns true when the given account exists.	1082	Returns the given player object, loading it if necessary (might block).
1106		1083
1107	=cut	1084	=cut
1108		1085
1109	sub cf::player::exists($) {	1086	sub playerdir($) {
1110	cf::player::find $_[0]	1087	cf::localdir
1111	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	1088	. "/"
		1089	. cf::playerdir
		1090	. "/"
		1091	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		1092	}
		1093
		1094	sub path($) {
		1095	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		1096
		1097	(playerdir $login) . "/$login.pl"
		1098	}
		1099
		1100	sub find_active($) {
		1101	$cf::PLAYER{$_[0]}
		1102	and $cf::PLAYER{$_[0]}->active
		1103	and $cf::PLAYER{$_[0]}
		1104	}
		1105
		1106	sub exists($) {
		1107	my ($login) = @_;
		1108
		1109	$cf::PLAYER{$login}
		1110	or cf::sync_job { !aio_stat $login }
		1111	}
		1112
		1113	sub find($) {
		1114	return $cf::PLAYER{$_[0]} \|\| do {
		1115	my $login = $_[0];
		1116
		1117	my $guard = cf::lock_acquire "user_find:$login";
		1118
		1119	$cf::PLAYER{$_[0]} \|\| do {
		1120	my $pl = load_pl path $login
		1121	or return;
		1122	$cf::PLAYER{$login} = $pl
		1123	}
		1124	}
		1125	}
		1126
		1127	sub save($) {
		1128	my ($pl) = @_;
		1129
		1130	return if $pl->{deny_save};
		1131
		1132	my $path = path $pl;
		1133	my $guard = cf::lock_acquire "user_save:$path";
		1134
		1135	return if $pl->{deny_save};
		1136
		1137	aio_mkdir playerdir $pl, 0770;
		1138	$pl->{last_save} = $cf::RUNTIME;
		1139
		1140	$pl->save_pl ($path);
		1141	Coro::cede;
		1142	}
		1143
		1144	sub new($) {
		1145	my ($login) = @_;
		1146
		1147	my $self = create;
		1148
		1149	$self->ob->name ($login);
		1150	$self->{deny_save} = 1;
		1151
		1152	$cf::PLAYER{$login} = $self;
		1153
		1154	$self
		1155	}
		1156
		1157	=item $pl->quit_character
		1158
		1159	Nukes the player without looking back. If logged in, the connection will
		1160	be destroyed. May block for a long time.
		1161
		1162	=cut
		1163
		1164	sub quit_character {
		1165	my ($pl) = @_;
		1166
		1167	$pl->{deny_save} = 1;
		1168	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1169
		1170	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1171	$pl->deactivate;
		1172	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1173	$pl->ns->destroy if $pl->ns;
		1174
		1175	my $path = playerdir $pl;
		1176	my $temp = "$path~$cf::RUNTIME~deleting~";
		1177	aio_rename $path, $temp;
		1178	delete $cf::PLAYER{$pl->ob->name};
		1179	$pl->destroy;
		1180	IO::AIO::aio_rmtree $temp;
		1181	}
		1182
		1183	=item cf::player::list_logins
		1184
		1185	Returns am arrayref of all valid playernames in the system, can take a
		1186	while and may block, so not sync_job-capable, ever.
		1187
		1188	=cut
		1189
		1190	sub list_logins {
		1191	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
		1192	or return [];
		1193
		1194	my @logins;
		1195
		1196	for my $login (@$dirs) {
		1197	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
		1198	aio_read $fh, 0, 512, my $buf, 0 or next;
		1199	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1200
		1201	utf8::decode $login;
		1202	push @logins, $login;
		1203	}
		1204
		1205	\@logins
		1206	}
		1207
		1208	=item $player->maps
		1209
		1210	Returns an arrayref of cf::path's of all maps that are private for this
		1211	player. May block.
		1212
		1213	=cut
		1214
		1215	sub maps($) {
		1216	my ($pl) = @_;
		1217
		1218	my $files = aio_readdir playerdir $pl
		1219	or return;
		1220
		1221	my @paths;
		1222
		1223	for (@$files) {
		1224	utf8::decode $_;
		1225	next if /\.(?:pl\|pst)$/;
		1226	next unless /^$PATH_SEP/o;
		1227
		1228	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
		1229	}
		1230
		1231	\@paths
1112	}	1232	}
1113		1233
1114	=item $player->ext_reply ($msgid, $msgtype, %msg)	1234	=item $player->ext_reply ($msgid, $msgtype, %msg)
1115		1235
1116	Sends an ext reply to the player.	1236	Sends an ext reply to the player.
1117		1237
1118	=cut	1238	=cut
1119		1239
1120	sub cf::player::ext_reply($$$%) {	1240	sub ext_reply($$$%) {
1121	my ($self, $id, %msg) = @_;	1241	my ($self, $id, %msg) = @_;
1122		1242
1123	$msg{msgid} = $id;	1243	$msg{msgid} = $id;
1124		1244
1125	$self->send ("ext " . to_json \%msg);	1245	$self->send ("ext " . cf::to_json \%msg);
1126	}	1246	}
		1247
		1248	package cf;
1127		1249
1128	=back	1250	=back
1129		1251
1130		1252
1131	=head3 cf::map	1253	=head3 cf::map
…		…
1137	package cf::map;	1259	package cf::map;
1138		1260
1139	use Fcntl;	1261	use Fcntl;
1140	use Coro::AIO;	1262	use Coro::AIO;
1141		1263
1142	our $MAX_RESET = 7200;	1264	our $MAX_RESET = 3600;
1143	our $DEFAULT_RESET = 3600;	1265	our $DEFAULT_RESET = 3000;
1144		1266
1145	sub generate_random_map {	1267	sub generate_random_map {
1146	my ($path, $rmp) = @_;	1268	my ($path, $rmp) = @_;
1147		1269
1148	# mit "rum" bekleckern, nicht	1270	# mit "rum" bekleckern, nicht
1149	cf::map::_create_random_map	1271	cf::map::_create_random_map (
1150	$path,	1272	$path,
1151	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1273	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1152	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1274	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1153	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1275	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1154	$rmp->{exit_on_final_map},	1276	$rmp->{exit_on_final_map},
…		…
1156	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1278	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1157	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1279	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1158	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},	1280	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1159	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},	1281	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1160	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1282	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1161	(cf::region::find $rmp->{region})	1283	(cf::region::find $rmp->{region}), $rmp->{custom}
		1284	)
1162	}	1285	}
1163		1286
1164	# and all this just because we cannot iterate over	1287	# and all this just because we cannot iterate over
1165	# all maps in C++...	1288	# all maps in C++...
1166	sub change_all_map_light {	1289	sub change_all_map_light {
…		…
1168		1291
1169	$_->change_map_light ($change)	1292	$_->change_map_light ($change)
1170	for grep $_->outdoor, values %cf::MAP;	1293	for grep $_->outdoor, values %cf::MAP;
1171	}	1294	}
1172		1295
1173	sub try_load_header($) {	1296	sub load_map_header($) {
1174	my ($path) = @_;	1297	my ($path) = @_;
1175		1298
1176	utf8::encode $path;	1299	utf8::encode $path;
1177	aio_open $path, O_RDONLY, 0	1300	aio_open $path, O_RDONLY, 0
1178	or return;	1301	or return;
1179		1302
1180	my $map = cf::map::new	1303	my $map = cf::map::new
1181	or return;	1304	or return;
1182		1305
		1306	# for better error messages only, will be overwritten later
		1307	$map->path ($path);
		1308
1183	$map->load_header ($path)	1309	$map->load_header ($path)
1184	or return;	1310	or return;
1185		1311
1186	$map->{load_path} = $path;	1312	$map->{load_path} = $path;
1187		1313
1188	$map	1314	$map
1189	}	1315	}
1190		1316
1191	sub find_map;	1317	sub find;
1192	sub find_map {	1318	sub find {
1193	my ($path, $origin) = @_;	1319	my ($path, $origin) = @_;
1194		1320
1195	#warn "find_map<$path,$origin>\n";#d#	1321	#warn "find<$path,$origin>\n";#d#
1196		1322
1197	$path = new cf::path $path, $origin && $origin->path;	1323	$path = new cf::path $path, $origin && $origin->path;
1198	my $key = $path->as_string;	1324	my $key = $path->as_string;
1199		1325
1200	cf::lock_wait "map_find:$key";	1326	cf::lock_wait "map_find:$key";
1201		1327
1202	$cf::MAP{$key} \|\| do {	1328	$cf::MAP{$key} \|\| do {
1203	my $guard = cf::lock_acquire "map_find:$key";	1329	my $guard = cf::lock_acquire "map_find:$key";
1204		1330
1205	# do it the slow way	1331	# do it the slow way
1206	my $map = try_load_header $path->save_path;	1332	my $map = $path->load_temp;
		1333
		1334	Coro::cede;
1207		1335
1208	if ($map) {	1336	if ($map) {
		1337	$map->last_access ((delete $map->{last_access})
		1338	\|\| $cf::RUNTIME); #d#
1209	# safety	1339	# safety
1210	$map->{instantiate_time} = $cf::RUNTIME	1340	$map->{instantiate_time} = $cf::RUNTIME
1211	if $map->{instantiate_time} > $cf::RUNTIME;	1341	if $map->{instantiate_time} > $cf::RUNTIME;
1212	} else {	1342	} else {
1213	if (my $rmp = $path->random_map_params) {	1343	$map = $path->load_orig
1214	$map = generate_random_map $key, $rmp;
1215	} else {
1216	$map = try_load_header $path->load_path;
1217	}
1218
1219	$map or return;	1344	or return;
1220		1345
1221	$map->{load_original} = 1;	1346	$map->{load_original} = 1;
1222	$map->{instantiate_time} = $cf::RUNTIME;	1347	$map->{instantiate_time} = $cf::RUNTIME;
		1348	$map->last_access ($cf::RUNTIME);
1223	$map->instantiate;	1349	$map->instantiate;
1224		1350
1225	# per-player maps become, after loading, normal maps	1351	# per-player maps become, after loading, normal maps
1226	$map->per_player (0) if $path->{user_rel};	1352	$map->per_player (0) if $path->{user_rel};
1227	}	1353	}
1228		1354
1229	$map->path ($key);	1355	$map->path ($key);
1230	$map->{path} = $path;	1356	$map->{path} = $path;
1231	$map->{last_save} = $cf::RUNTIME;	1357	$map->{last_save} = $cf::RUNTIME;
1232	$map->last_access ($cf::RUNTIME);	1358
		1359	Coro::cede;
1233		1360
1234	if ($map->should_reset) {	1361	if ($map->should_reset) {
1235	$map->reset;	1362	$map->reset;
1236	undef $guard;	1363	undef $guard;
1237	$map = find_map $path	1364	$map = find $path
1238	or return;	1365	or return;
1239	}	1366	}
1240		1367
1241	$cf::MAP{$key} = $map	1368	$cf::MAP{$key} = $map
1242	}	1369	}
…		…
1264	if (aio_open $uniq, O_RDONLY, 0) {	1391	if (aio_open $uniq, O_RDONLY, 0) {
1265	$self->clear_unique_items;	1392	$self->clear_unique_items;
1266	$self->load_objects ($uniq, 0);	1393	$self->load_objects ($uniq, 0);
1267	}	1394	}
1268	}	1395	}
		1396
		1397	Coro::cede;
1269		1398
1270	# now do the right thing for maps	1399	# now do the right thing for maps
1271	$self->link_multipart_objects;	1400	$self->link_multipart_objects;
1272		1401
1273	if ($self->{path}->is_style_map) {	1402	if ($self->{path}->is_style_map) {
…		…
1281	$self->difficulty ($self->estimate_difficulty)	1410	$self->difficulty ($self->estimate_difficulty)
1282	unless $self->difficulty;	1411	unless $self->difficulty;
1283	$self->activate;	1412	$self->activate;
1284	}	1413	}
1285		1414
		1415	Coro::cede;
		1416
1286	$self->in_memory (cf::MAP_IN_MEMORY);	1417	$self->in_memory (cf::MAP_IN_MEMORY);
1287	}	1418	}
1288		1419
1289	sub load_map_sync {	1420	# find and load all maps in the 3x3 area around a map
		1421	sub load_diag {
		1422	my ($map) = @_;
		1423
		1424	my @diag; # diagonal neighbours
		1425
		1426	for (0 .. 3) {
		1427	my $neigh = $map->tile_path ($_)
		1428	or next;
		1429	$neigh = find $neigh, $map
		1430	or next;
		1431	$neigh->load;
		1432
		1433	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
		1434	[$neigh->tile_path (($_ + 1) % 4), $neigh];
		1435	}
		1436
		1437	for (@diag) {
		1438	my $neigh = find @$_
		1439	or next;
		1440	$neigh->load;
		1441	}
		1442	}
		1443
		1444	sub find_sync {
1290	my ($path, $origin) = @_;	1445	my ($path, $origin) = @_;
1291		1446
1292	#warn "load_map_sync<$path, $origin>\n";#d#	1447	cf::sync_job { find $path, $origin }
		1448	}
1293		1449
1294	cf::sync_job {	1450	sub do_load_sync {
1295	my $map = cf::map::find_map $path, $origin	1451	my ($map) = @_;
		1452
		1453	cf::sync_job { $map->load };
		1454	}
		1455
		1456	our %MAP_PREFETCH;
		1457	our $MAP_PREFETCHER = Coro::async {
		1458	while () {
		1459	while (%MAP_PREFETCH) {
		1460	my $key = each %MAP_PREFETCH
1296	or return;	1461	or next;
		1462	my $path = delete $MAP_PREFETCH{$key};
		1463
		1464	my $map = find $path
		1465	or next;
1297	$map->load;	1466	$map->load;
1298	$map	1467	}
		1468	Coro::schedule;
1299	}	1469	}
		1470	};
		1471
		1472	sub find_async {
		1473	my ($path, $origin) = @_;
		1474
		1475	$path = new cf::path $path, $origin && $origin->path;
		1476	my $key = $path->as_string;
		1477
		1478	if (my $map = $cf::MAP{$key}) {
		1479	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
		1480	}
		1481
		1482	$MAP_PREFETCH{$key} = $path;
		1483	$MAP_PREFETCHER->ready;
		1484
		1485	()
1300	}	1486	}
1301		1487
1302	sub save {	1488	sub save {
1303	my ($self) = @_;	1489	my ($self) = @_;
1304		1490
		1491	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1492
1305	$self->{last_save} = $cf::RUNTIME;	1493	$self->{last_save} = $cf::RUNTIME;
1306		1494
1307	return unless $self->dirty;	1495	return unless $self->dirty;
1308		1496
1309	my $save = $self->{path}->save_path; utf8::encode $save;	1497	my $save = $self->{path}->save_path; utf8::encode $save;
1310	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1498	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311		1499
1312	$self->{load_path} = $save;	1500	$self->{load_path} = $save;
1313		1501
1314	return if $self->{deny_save};	1502	return if $self->{deny_save};
		1503
		1504	local $self->{last_access} = $self->last_access;#d#
		1505
		1506	cf::async {
		1507	$_->contr->save for $self->players;
		1508	};
1315		1509
1316	if ($uniq) {	1510	if ($uniq) {
1317	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	1511	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
1318	$self->save_objects ($uniq, cf::IO_UNIQUES);	1512	$self->save_objects ($uniq, cf::IO_UNIQUES);
1319	} else {	1513	} else {
…		…
1325	my ($self) = @_;	1519	my ($self) = @_;
1326		1520
1327	# save first because save cedes	1521	# save first because save cedes
1328	$self->save;	1522	$self->save;
1329		1523
		1524	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1525
1330	return if $self->players;	1526	return if $self->players;
1331	return if $self->in_memory != cf::MAP_IN_MEMORY;	1527	return if $self->in_memory != cf::MAP_IN_MEMORY;
1332	return if $self->{deny_save};	1528	return if $self->{deny_save};
1333		1529
1334	$self->clear;	1530	$self->clear;
…		…
1376	}	1572	}
1377		1573
1378	sub reset {	1574	sub reset {
1379	my ($self) = @_;	1575	my ($self) = @_;
1380		1576
		1577	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1578
1381	return if $self->players;	1579	return if $self->players;
1382	return if $self->{path}{user_rel};#d#	1580	return if $self->{path}{user_rel};#d#
1383		1581
1384	warn "resetting map ", $self->path;#d#	1582	warn "resetting map ", $self->path;#d#
1385		1583
…		…
1404		1602
1405	sub customise_for {	1603	sub customise_for {
1406	my ($map, $ob) = @_;	1604	my ($map, $ob) = @_;
1407		1605
1408	if ($map->per_player) {	1606	if ($map->per_player) {
1409	return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path};	1607	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1410	}	1608	}
1411		1609
1412	$map	1610	$map
1413	}	1611	}
1414		1612
1415	sub emergency_save {	1613	=item cf::map::unique_maps
1416	local $cf::FREEZE = 1;
1417		1614
1418	warn "enter emergency map save\n";	1615	Returns an arrayref of cf::path's of all shared maps that have
		1616	instantiated unique items. May block.
1419		1617
1420	cf::sync_job {	1618	=cut
1421	warn "begin emergency map save\n";	1619
1422	$_->save for values %cf::MAP;	1620	sub unique_maps() {
		1621	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1622	or return;
		1623
		1624	my @paths;
		1625
		1626	for (@$files) {
		1627	utf8::decode $_;
		1628	next if /\.pst$/;
		1629	next unless /^$PATH_SEP/o;
		1630
		1631	push @paths, new cf::path $_;
1423	};	1632	}
1424		1633
1425	warn "end emergency map save\n";	1634	\@paths
1426	}	1635	}
1427		1636
1428	package cf;	1637	package cf;
1429		1638
1430	=back	1639	=back
1431		1640
		1641	=head3 cf::object
		1642
		1643	=cut
		1644
		1645	package cf::object;
		1646
		1647	=over 4
		1648
		1649	=item $ob->inv_recursive
		1650
		1651	Returns the inventory of the object _and_ their inventories, recursively.
		1652
		1653	=cut
		1654
		1655	sub inv_recursive_;
		1656	sub inv_recursive_ {
		1657	map { $_, inv_recursive_ $_->inv } @_
		1658	}
		1659
		1660	sub inv_recursive {
		1661	inv_recursive_ inv $_[0]
		1662	}
		1663
		1664	package cf;
		1665
		1666	=back
1432		1667
1433	=head3 cf::object::player	1668	=head3 cf::object::player
1434		1669
1435	=over 4	1670	=over 4
1436		1671
…		…
1511	my $link_pos = delete $self->{_link_pos};	1746	my $link_pos = delete $self->{_link_pos};
1512		1747
1513	unless ($map) {	1748	unless ($map) {
1514	# restore original map position	1749	# restore original map position
1515	($map, $x, $y) = @{ $link_pos \|\| [] };	1750	($map, $x, $y) = @{ $link_pos \|\| [] };
1516	$map = cf::map::find_map $map;	1751	$map = cf::map::find $map;
1517		1752
1518	unless ($map) {	1753	unless ($map) {
1519	($map, $x, $y) = @$EMERGENCY_POSITION;	1754	($map, $x, $y) = @$EMERGENCY_POSITION;
1520	$map = cf::map::find_map $map	1755	$map = cf::map::find $map
1521	or die "FATAL: cannot load emergency map\n";	1756	or die "FATAL: cannot load emergency map\n";
1522	}	1757	}
1523	}	1758	}
1524		1759
1525	($x, $y) = (-1, -1)	1760	($x, $y) = (-1, -1)
…		…
1528	# use -1 or undef as default coordinates, not 0, 0	1763	# use -1 or undef as default coordinates, not 0, 0
1529	($x, $y) = ($map->enter_x, $map->enter_y)	1764	($x, $y) = ($map->enter_x, $map->enter_y)
1530	if $x <=0 && $y <= 0;	1765	if $x <=0 && $y <= 0;
1531		1766
1532	$map->load;	1767	$map->load;
		1768	$map->load_diag;
1533		1769
		1770	return unless $self->contr->active;
1534	$self->activate_recursive;	1771	$self->activate_recursive;
1535	$self->enter_map ($map, $x, $y);	1772	$self->enter_map ($map, $x, $y);
1536	}	1773	}
1537		1774
1538	cf::player->attach (	1775	cf::player->attach (
…		…
1551		1788
1552	# try to abort aborted map switching on player login :)	1789	# try to abort aborted map switching on player login :)
1553	# should happen only on crashes	1790	# should happen only on crashes
1554	if ($pl->ob->{_link_pos}) {	1791	if ($pl->ob->{_link_pos}) {
1555	$pl->ob->enter_link;	1792	$pl->ob->enter_link;
1556	cf::async {	1793	(async {
1557	# we need this sleep as the login has a concurrent enter_exit running	1794	# we need this sleep as the login has a concurrent enter_exit running
1558	# and this sleep increases chances of the player not ending up in scorn	1795	# and this sleep increases chances of the player not ending up in scorn
		1796	$pl->ob->reply (undef,
		1797	"There was an internal problem at your last logout, "
		1798	. "the server will try to bring you to your intended destination in a second.",
		1799	cf::NDI_RED);
1559	Coro::Timer::sleep 1;	1800	Coro::Timer::sleep 1;
1560	$pl->ob->leave_link;	1801	$pl->ob->leave_link;
1561	};	1802	})->prio (2);
1562	}	1803	}
1563	},	1804	},
1564	);	1805	);
1565		1806
1566	=item $player_object->goto_map ($path, $x, $y)	1807	=item $player_object->goto ($path, $x, $y)
1567		1808
1568	=cut	1809	=cut
1569		1810
1570	sub cf::object::player::goto_map {	1811	sub cf::object::player::goto {
1571	my ($self, $path, $x, $y) = @_;	1812	my ($self, $path, $x, $y) = @_;
1572		1813
		1814	$path = new cf::path $path;
		1815
1573	$self->enter_link;	1816	$self->enter_link;
1574		1817
1575	(cf::async {	1818	(async {
1576	$path = new cf::path $path;
1577
1578	my $map = cf::map::find_map $path->as_string;	1819	my $map = cf::map::find $path->as_string;
1579	$map = $map->customise_for ($self) if $map;	1820	$map = $map->customise_for ($self) if $map;
1580		1821
1581	# warn "entering ", $map->path, " at ($x, $y)\n"	1822	# warn "entering ", $map->path, " at ($x, $y)\n"
1582	# if $map;	1823	# if $map;
1583		1824
1584	$map or $self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	1825	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1585		1826
1586	$self->leave_link ($map, $x, $y);	1827	$self->leave_link ($map, $x, $y);
1587	})->prio (1);	1828	})->prio (1);
1588	}	1829	}
1589		1830
…		…
1642		1883
1643	return unless $self->type == cf::PLAYER;	1884	return unless $self->type == cf::PLAYER;
1644		1885
1645	$self->enter_link;	1886	$self->enter_link;
1646		1887
1647	(cf::async {	1888	(async {
		1889	$self->deactivate_recursive; # just to be sure
1648	unless (eval {	1890	unless (eval {
1649	prepare_random_map $exit	1891	prepare_random_map $exit
1650	if $exit->slaying eq "/!";	1892	if $exit->slaying eq "/!";
1651		1893
1652	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;	1894	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1653	$self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);	1895	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1654		1896
1655	1;	1897	1;
1656	}) {	1898	}) {
1657	$self->message ("Something went wrong deep within the crossfire server. "	1899	$self->message ("Something went wrong deep within the crossfire server. "
1658	. "I'll try to bring you back to the map you were before. "	1900	. "I'll try to bring you back to the map you were before. "
1659	. "Please report this to the dungeon master",	1901	. "Please report this to the dungeon master!",
1660	cf::NDI_UNIQUE \| cf::NDI_RED);	1902	cf::NDI_UNIQUE \| cf::NDI_RED);
1661		1903
1662	warn "ERROR in enter_exit: $@";	1904	warn "ERROR in enter_exit: $@";
1663	$self->leave_link;	1905	$self->leave_link;
1664	}	1906	}
…		…
1732	}	1974	}
1733	}	1975	}
1734	},	1976	},
1735	);	1977	);
1736		1978
1737	=item $client->coro (\&cb)	1979	=item $client->async (\&cb)
1738		1980
1739	Create a new coroutine, running the specified callback. The coroutine will	1981	Create a new coroutine, running the specified callback. The coroutine will
1740	be automatically cancelled when the client gets destroyed (e.g. on logout,	1982	be automatically cancelled when the client gets destroyed (e.g. on logout,
1741	or loss of connection).	1983	or loss of connection).
1742		1984
1743	=cut	1985	=cut
1744		1986
1745	sub cf::client::coro {	1987	sub cf::client::async {
1746	my ($self, $cb) = @_;	1988	my ($self, $cb) = @_;
1747		1989
1748	my $coro = &cf::async ($cb);	1990	my $coro = &Coro::async ($cb);
1749		1991
1750	$coro->on_destroy (sub {	1992	$coro->on_destroy (sub {
1751	delete $self->{_coro}{$coro+0};	1993	delete $self->{_coro}{$coro+0};
1752	});	1994	});
1753		1995
…		…
1988	open my $fh, "<:utf8", cf::confdir . "/config"	2230	open my $fh, "<:utf8", cf::confdir . "/config"
1989	or return;	2231	or return;
1990		2232
1991	local $/;	2233	local $/;
1992	*CFG = YAML::Syck::Load <$fh>;	2234	*CFG = YAML::Syck::Load <$fh>;
		2235
		2236	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
		2237
		2238	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2239	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2240
		2241	if (exists $CFG{mlockall}) {
		2242	eval {
		2243	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
		2244	and die "WARNING: m(un)lockall failed: $!\n";
		2245	};
		2246	warn $@ if $@;
		2247	}
1993	}	2248	}
1994		2249
1995	sub main {	2250	sub main {
1996	# we must not ever block the main coroutine	2251	# we must not ever block the main coroutine
1997	local $Coro::idle = sub {	2252	local $Coro::idle = sub {
1998	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2253	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1999	(Coro::unblock_sub {
2000	Event::one_event;	2254	async { Event::one_event };
2001	})->();
2002	};	2255	};
2003		2256
2004	cfg_load;	2257	cfg_load;
2005	db_load;	2258	db_load;
2006	load_extensions;	2259	load_extensions;
2007	Event::loop;	2260	Event::loop;
2008	}	2261	}
2009		2262
2010	#############################################################################	2263	#############################################################################
2011	# initialisation	2264	# initialisation and cleanup
		2265
		2266	# install some emergency cleanup handlers
		2267	BEGIN {
		2268	for my $signal (qw(INT HUP TERM)) {
		2269	Event->signal (
		2270	data => WF_AUTOCANCEL,
		2271	signal => $signal,
		2272	cb => sub {
		2273	cf::cleanup "SIG$signal";
		2274	},
		2275	);
		2276	}
		2277	}
		2278
		2279	sub emergency_save() {
		2280	my $freeze_guard = cf::freeze_mainloop;
		2281
		2282	warn "enter emergency perl save\n";
		2283
		2284	cf::sync_job {
		2285	# use a peculiar iteration method to avoid tripping on perl
		2286	# refcount bugs in for. also avoids problems with players
		2287	# and maps saved/Destroyed asynchronously.
		2288	warn "begin emergency player save\n";
		2289	for my $login (keys %cf::PLAYER) {
		2290	my $pl = $cf::PLAYER{$login} or next;
		2291	$pl->valid or next;
		2292	$pl->save;
		2293	}
		2294	warn "end emergency player save\n";
		2295
		2296	warn "begin emergency map save\n";
		2297	for my $path (keys %cf::MAP) {
		2298	my $map = $cf::MAP{$path} or next;
		2299	$map->valid or next;
		2300	$map->save;
		2301	}
		2302	warn "end emergency map save\n";
		2303	};
		2304
		2305	warn "leave emergency perl save\n";
		2306	}
2012		2307
2013	sub reload() {	2308	sub reload() {
2014	# can/must only be called in main	2309	# can/must only be called in main
2015	if ($Coro::current != $Coro::main) {	2310	if ($Coro::current != $Coro::main) {
2016	warn "can only reload from main coroutine\n";	2311	warn "can only reload from main coroutine\n";
2017	return;	2312	return;
2018	}	2313	}
2019		2314
2020	warn "reloading...";	2315	warn "reloading...";
2021		2316
2022	local $FREEZE = 1;	2317	warn "freezing server";
		2318	my $guard = freeze_mainloop;
2023	cf::emergency_save;	2319	cf::emergency_save;
		2320
		2321	warn "sync database to disk";
		2322	cf::db_sync;
		2323	IO::AIO::flush;
2024		2324
2025	eval {	2325	eval {
2026	# if anything goes wrong in here, we should simply crash as we already saved	2326	# if anything goes wrong in here, we should simply crash as we already saved
2027		2327
2028	# cancel all watchers	2328	warn "cancel all watchers";
2029	for (Event::all_watchers) {	2329	for (Event::all_watchers) {
2030	$_->cancel if $_->data & WF_AUTOCANCEL;	2330	$_->cancel if $_->data & WF_AUTOCANCEL;
2031	}	2331	}
2032		2332
2033	# cancel all extension coros	2333	warn "cancel all extension coros";
2034	$_->cancel for values %EXT_CORO;	2334	$_->cancel for values %EXT_CORO;
2035	%EXT_CORO = ();	2335	%EXT_CORO = ();
2036		2336
		2337	warn "remove commands";
		2338	%COMMAND = ();
		2339
		2340	warn "remove ext commands";
		2341	%EXTCMD = ();
		2342
2037	# unload all extensions	2343	warn "unload/nuke all extensions";
2038	for (@exts) {	2344	for my $pkg (@EXTS) {
2039	warn "unloading <$_>";	2345	warn "... unloading $pkg";
2040	unload_extension $_;	2346
		2347	if (my $cb = $pkg->can ("unload")) {
		2348	eval {
		2349	$cb->($pkg);
		2350	1
		2351	} or warn "$pkg unloaded, but with errors: $@";
2041	}	2352	}
2042		2353
		2354	warn "... nuking $pkg";
		2355	Symbol::delete_package $pkg;
		2356	}
		2357
2043	# unload all modules loaded from $LIBDIR	2358	warn "unload all perl modules loaded from $LIBDIR";
2044	while (my ($k, $v) = each %INC) {	2359	while (my ($k, $v) = each %INC) {
2045	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2360	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2046		2361
2047	warn "removing <$k>";	2362	warn "removing <$k>";
2048	delete $INC{$k};	2363	delete $INC{$k};
…		…
2055	}	2370	}
2056		2371
2057	Symbol::delete_package $k;	2372	Symbol::delete_package $k;
2058	}	2373	}
2059		2374
2060	# sync database to disk
2061	cf::db_sync;
2062	IO::AIO::flush;
2063
2064	# get rid of safe::, as good as possible	2375	warn "get rid of safe::, as good as possible";
2065	Symbol::delete_package "safe::$_"	2376	Symbol::delete_package "safe::$_"
2066	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2377	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2067		2378
2068	# remove register_script_function callbacks
2069	# TODO
2070
2071	# unload cf.pm "a bit"	2379	warn "unload cf.pm \"a bit\"";
2072	delete $INC{"cf.pm"};	2380	delete $INC{"cf.pm"};
2073		2381
2074	# don't, removes xs symbols, too,	2382	# don't, removes xs symbols, too,
2075	# and global variables created in xs	2383	# and global variables created in xs
2076	#Symbol::delete_package __PACKAGE__;	2384	#Symbol::delete_package __PACKAGE__;
2077		2385
2078	# reload cf.pm
2079	warn "reloading cf.pm";	2386	warn "reloading cf.pm";
2080	require cf;	2387	require cf;
2081	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2388	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2082		2389
2083	# load config and database again	2390	warn "load config and database again";
2084	cf::cfg_load;	2391	cf::cfg_load;
2085	cf::db_load;	2392	cf::db_load;
2086		2393
2087	# load extensions
2088	warn "load extensions";	2394	warn "load extensions";
2089	cf::load_extensions;	2395	cf::load_extensions;
2090		2396
2091	# reattach attachments to objects	2397	warn "reattach attachments to objects/players";
2092	warn "reattach";
2093	_global_reattach;	2398	_global_reattach;
		2399	warn "reattach attachments to maps";
		2400	reattach $_ for values %MAP;
2094	};	2401	};
2095		2402
2096	if ($@) {	2403	if ($@) {
2097	warn $@;	2404	warn $@;
2098	warn "error while reloading, exiting.";	2405	warn "error while reloading, exiting.";
2099	exit 1;	2406	exit 1;
2100	}	2407	}
2101		2408
2102	warn "reloaded successfully";	2409	warn "reloaded";
2103	};	2410	};
2104		2411
2105	#############################################################################	2412	#############################################################################
2106		2413
2107	unless ($LINK_MAP) {	2414	unless ($LINK_MAP) {
…		…
2114	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";	2421	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2115	$LINK_MAP->in_memory (MAP_IN_MEMORY);	2422	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2116		2423
2117	# dirty hack because... archetypes are not yet loaded	2424	# dirty hack because... archetypes are not yet loaded
2118	Event->timer (	2425	Event->timer (
2119	after => 2,	2426	after => 10,
2120	cb => sub {	2427	cb => sub {
2121	$_[0]->w->cancel;	2428	$_[0]->w->cancel;
2122		2429
2123	# provide some exits "home"	2430	# provide some exits "home"
2124	my $exit = cf::object::new "exit";	2431	my $exit = cf::object::new "exit";
…		…
2143	$LINK_MAP->{deny_reset} = 1;	2450	$LINK_MAP->{deny_reset} = 1;
2144		2451
2145	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;	2452	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2146	}	2453	}
2147		2454
2148	register "<global>", __PACKAGE__;
2149
2150	register_command "reload" => sub {	2455	register_command "reload" => sub {
2151	my ($who, $arg) = @_;	2456	my ($who, $arg) = @_;
2152		2457
2153	if ($who->flag (FLAG_WIZ)) {	2458	if ($who->flag (FLAG_WIZ)) {
2154	$who->message ("start of reload.");	2459	$who->message ("start of reload.");
…		…
2163	reentrant => 0,	2468	reentrant => 0,
2164	prio => 0,	2469	prio => 0,
2165	at => $NEXT_TICK \|\| $TICK,	2470	at => $NEXT_TICK \|\| $TICK,
2166	data => WF_AUTOCANCEL,	2471	data => WF_AUTOCANCEL,
2167	cb => sub {	2472	cb => sub {
2168	unless ($FREEZE) {	2473	$NOW = Event::time;
		2474
2169	cf::server_tick; # one server iteration	2475	cf::server_tick; # one server iteration
2170	$RUNTIME += $TICK;	2476	$RUNTIME += $TICK;
2171	}
2172
2173	$NEXT_TICK += $TICK;	2477	$NEXT_TICK += $TICK;
		2478
		2479	$WAIT_FOR_TICK->broadcast;
		2480	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2174		2481
2175	# if we are delayed by four ticks or more, skip them all	2482	# if we are delayed by four ticks or more, skip them all
2176	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2483	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2177		2484
2178	$TICK_WATCHER->at ($NEXT_TICK);	2485	$TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.130 by root, Thu Jan 4 00:08:08 2007 UTC vs. Revision 1.163 by root, Thu Jan 11 01:01:56 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.130 by root, Thu Jan 4 00:08:08 2007 UTC vs.
Revision 1.163 by root, Thu Jan 11 01:01:56 2007 UTC