ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.398 by root, Wed Dec 5 11:08:34 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;	9	use EV;
10	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.61 ();	15	use Coro 4.1 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::EV;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
25	use JSON::XS 1.4 ();	26	use JSON::XS 2.01 ();
26	use BDB ();	27	use BDB ();
27	use Data::Dumper;	28	use Data::Dumper;
28	use Digest::MD5;	29	use Digest::MD5;
29	use Fcntl;	30	use Fcntl;
30	use YAML::Syck ();	31	use YAML::Syck ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
34	use Digest::MD5 ();	35	use Digest::MD5 ();
35		36
36	# configure various modules to our taste	37	# configure various modules to our taste
37	#	38	#
38	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
39	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	41	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42	$Event::Eval = 1; # no idea why this is required, but it is
43		42
44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	43	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45	$YAML::Syck::ImplicitUnicode = 1;	44	$YAML::Syck::ImplicitUnicode = 1;
46		45
47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	46	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
…		…
79	our $NEXT_TICK;	78	our $NEXT_TICK;
80	our $NOW;	79	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	80	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		81
83	our $BDB_POLL_WATCHER;	82	our $BDB_POLL_WATCHER;
		83	our $BDB_DEADLOCK_WATCHER;
		84	our $BDB_CHECKPOINT_WATCHER;
		85	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	86	our $DB_ENV;
85		87
86	our %CFG;	88	our %CFG;
87		89
88	our $UPTIME; $UPTIME ||= time;	90	our $UPTIME; $UPTIME ||= time;
89	our $RUNTIME;	91	our $RUNTIME;
90		92
91	our %PLAYER; # all users	93	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	94	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	95	our $LINK_MAP; # the special {link} map, which is always available
94		96
95	# used to convert map paths into valid unix filenames by replacing / by ∕	97	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	98	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		99
…		…
158		160
159	The raw value load value from the last tick.	161	The raw value load value from the last tick.
160		162
161	=item %cf::CFG	163	=item %cf::CFG
162		164
163	Configuration for the server, loaded from C</etc/crossfire/config>, or	165	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164	from wherever your confdir points to.	166	from wherever your confdir points to.
165		167
166	=item cf::wait_for_tick, cf::wait_for_tick_begin	168	=item cf::wait_for_tick, cf::wait_for_tick_begin
167		169
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	170	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
186	$msg .= "\n"	188	$msg .= "\n"
187	unless $msg =~ /\n$/;	189	unless $msg =~ /\n$/;
188		190
189	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	191	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190		192
191	utf8::encode $msg;
192	LOG llevError, $msg;	193	LOG llevError, $msg;
193	};	194	};
194	}	195	}
195		196
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
212	)) {	213	)) {
213	no strict 'refs';	214	no strict 'refs';
214	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215	}	216	}
216		217
217	$Event::DIED = sub {	218	$EV::DIED = sub {
218	warn "error in event callback: @_";	219	warn "error in event callback: @_";
219	};	220	};
220		221
221	#############################################################################	222	#############################################################################
222		223
…		…
245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246	$d	247	$d
247	} || "[unable to dump $_[0]: '$@']";	248	} || "[unable to dump $_[0]: '$@']";
248	}	249	}
249		250
250	=item $ref = cf::from_json $json	251	=item $ref = cf::decode_json $json
251		252
252	Converts a JSON string into the corresponding perl data structure.	253	Converts a JSON string into the corresponding perl data structure.
253		254
254	=item $json = cf::to_json $ref	255	=item $json = cf::encode_json $ref
255		256
256	Converts a perl data structure into its JSON representation.	257	Converts a perl data structure into its JSON representation.
257		258
258	=cut	259	=cut
259		260
260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261		262
262	sub to_json ($) { $json_coder->encode ($_[0]) }	263	sub encode_json($) { $json_coder->encode ($_[0]) }
263	sub from_json ($) { $json_coder->decode ($_[0]) }	264	sub decode_json($) { $json_coder->decode ($_[0]) }
264		265
265	=item cf::lock_wait $string	266	=item cf::lock_wait $string
266		267
267	Wait until the given lock is available. See cf::lock_acquire.	268	Wait until the given lock is available. See cf::lock_acquire.
268		269
…		…
271	Wait until the given lock is available and then acquires it and returns	272	Wait until the given lock is available and then acquires it and returns
272	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	273	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273	for example when the coroutine gets canceled), the lock is automatically	274	for example when the coroutine gets canceled), the lock is automatically
274	returned.	275	returned.
275		276
		277	Locks are *not* recursive, locking from the same coro twice results in a
		278	deadlocked coro.
		279
276	Lock names should begin with a unique identifier (for example, cf::map::find	280	Lock names should begin with a unique identifier (for example, cf::map::find
277	uses map_find and cf::map::load uses map_load).	281	uses map_find and cf::map::load uses map_load).
278		282
279	=item $locked = cf::lock_active $string	283	=item $locked = cf::lock_active $string
280		284
281	Return true if the lock is currently active, i.e. somebody has locked it.	285	Return true if the lock is currently active, i.e. somebody has locked it.
282		286
283	=cut	287	=cut
284		288
285	our %LOCK;	289	our %LOCK;
		290	our %LOCKER;#d#
286		291
287	sub lock_wait($) {	292	sub lock_wait($) {
288	my ($key) = @_;	293	my ($key) = @_;
		294
		295	if ($LOCKER{$key} == $Coro::current) {#d#
		296	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		297	return;#d#
		298	}#d#
289		299
290	# wait for lock, if any	300	# wait for lock, if any
291	while ($LOCK{$key}) {	301	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;	302	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;	303	Coro::schedule;
…		…
299		309
300	# wait, to be sure we are not locked	310	# wait, to be sure we are not locked
301	lock_wait $key;	311	lock_wait $key;
302		312
303	$LOCK{$key} = [];	313	$LOCK{$key} = [];
		314	$LOCKER{$key} = $Coro::current;#d#
304		315
305	Coro::guard {	316	Coro::guard {
		317	delete $LOCKER{$key};#d#
306	# wake up all waiters, to be on the safe side	318	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };	319	$_->ready for @{ delete $LOCK{$key} };
308	}	320	}
309	}	321	}
310		322
…		…
322	};	334	};
323	$TICK_WATCHER->stop;	335	$TICK_WATCHER->stop;
324	$guard	336	$guard
325	}	337	}
326		338
		339	=item cf::periodic $interval, $cb
		340
		341	Like EV::periodic, but randomly selects a starting point so that the actions
		342	get spread over timer.
		343
		344	=cut
		345
		346	sub periodic($$) {
		347	my ($interval, $cb) = @_;
		348
		349	my $start = rand List::Util::min 180, $interval;
		350
		351	EV::periodic $start, $interval, 0, $cb
		352	}
		353
		354	=item cf::get_slot $time[, $priority[, $name]]
		355
		356	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		357	This call blocks and returns only when you have at least C<$time> seconds
		358	of cpu time till the next tick. The slot is only valid till the next cede.
		359
		360	The optional C<$name> can be used to identify the job to run. It might be
		361	used for statistical purposes and should identify the same time-class.
		362
		363	Useful for short background jobs.
		364
		365	=cut
		366
		367	our @SLOT_QUEUE;
		368	our $SLOT_QUEUE;
		369
		370	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		371	$SLOT_QUEUE = Coro::async {
		372	$Coro::current->desc ("timeslot manager");
		373
		374	my $signal = new Coro::Signal;
		375
		376	while () {
		377	next_job:
		378	my $avail = cf::till_tick;
		379	if ($avail > 0.01) {
		380	for (0 .. $#SLOT_QUEUE) {
		381	if ($SLOT_QUEUE[$_][0] < $avail) {
		382	my $job = splice @SLOT_QUEUE, $_, 1, ();
		383	$job->[2]->send;
		384	Coro::cede;
		385	goto next_job;
		386	}
		387	}
		388	}
		389
		390	if (@SLOT_QUEUE) {
		391	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		392	push @cf::WAIT_FOR_TICK, $signal;
		393	$signal->wait;
		394	} else {
		395	Coro::schedule;
		396	}
		397	}
		398	};
		399
		400	sub get_slot($;$$) {
		401	my ($time, $pri, $name) = @_;
		402
		403	$time = $TICK * .6 if $time > $TICK * .6;
		404	my $sig = new Coro::Signal;
		405
		406	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		407	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		408	$SLOT_QUEUE->ready;
		409	$sig->wait;
		410	}
		411
327	=item cf::async { BLOCK }	412	=item cf::async { BLOCK }
328		413
329	Currently the same as Coro::async_pool, meaning you cannot use	414	Currently the same as Coro::async_pool, meaning you cannot use
330	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	415	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331	thing you are allowed to do is call C<prio> on it.	416	thing you are allowed to do is call C<prio> on it.
…		…
334		419
335	BEGIN { *async = \&Coro::async_pool }	420	BEGIN { *async = \&Coro::async_pool }
336		421
337	=item cf::sync_job { BLOCK }	422	=item cf::sync_job { BLOCK }
338		423
339	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	424	The design of Deliantra requires that the main coroutine ($Coro::main)
340	is always able to handle events or runnable, as Crossfire TRT is only	425	is always able to handle events or runnable, as Deliantra is only
341	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	426	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342	acceptable.	427	acceptable.
343		428
344	If it must be done, put the blocking parts into C<sync_job>. This will run	429	If it must be done, put the blocking parts into C<sync_job>. This will run
345	the given BLOCK in another coroutine while waiting for the result. The	430	the given BLOCK in another coroutine while waiting for the result. The
…		…
350		435
351	sub sync_job(&) {	436	sub sync_job(&) {
352	my ($job) = @_;	437	my ($job) = @_;
353		438
354	if ($Coro::current == $Coro::main) {	439	if ($Coro::current == $Coro::main) {
355	my $time = Event::time;	440	my $time = EV::time;
356		441
357	# this is the main coro, too bad, we have to block	442	# this is the main coro, too bad, we have to block
358	# till the operation succeeds, freezing the server :/	443	# till the operation succeeds, freezing the server :/
359		444
		445	LOG llevError, Carp::longmess "sync job";#d#
		446
360	# TODO: use suspend/resume instead	447	# TODO: use suspend/resume instead
361	# (but this is cancel-safe)	448	# (but this is cancel-safe)
362	my $freeze_guard = freeze_mainloop;	449	my $freeze_guard = freeze_mainloop;
363		450
364	my $busy = 1;	451	my $busy = 1;
365	my @res;	452	my @res;
366		453
367	(async {	454	(async {
		455	$Coro::current->desc ("sync job coro");
368	@res = eval { $job->() };	456	@res = eval { $job->() };
369	warn $@ if $@;	457	warn $@ if $@;
370	undef $busy;	458	undef $busy;
371	})->prio (Coro::PRIO_MAX);	459	})->prio (Coro::PRIO_MAX);
372		460
373	while ($busy) {	461	while ($busy) {
374	Coro::cede or Event::one_event;	462	if (Coro::nready) {
		463	Coro::cede_notself;
		464	} else {
		465	EV::loop EV::LOOP_ONESHOT;
375	}	466	}
		467	}
376		468
377	$time = Event::time - $time;	469	$time = EV::time - $time;
378		470
379	LOG llevError | logBacktrace, Carp::longmess "long sync job"	471	LOG llevError | logBacktrace, Carp::longmess "long sync job"
380	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	472	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381		473
382	$tick_start += $time; # do not account sync jobs to server load	474	$tick_start += $time; # do not account sync jobs to server load
…		…
412	=item fork_call { }, $args	504	=item fork_call { }, $args
413		505
414	Executes the given code block with the given arguments in a seperate	506	Executes the given code block with the given arguments in a seperate
415	process, returning the results. Everything must be serialisable with	507	process, returning the results. Everything must be serialisable with
416	Coro::Storable. May, of course, block. Note that the executed sub may	508	Coro::Storable. May, of course, block. Note that the executed sub may
417	never block itself or use any form of Event handling.	509	never block itself or use any form of event handling.
418		510
419	=cut	511	=cut
420
421	sub _store_scalar {
422	open my $fh, ">", \my $buf
423	or die "fork_call: cannot open fh-to-buf in child : $!";
424	Storable::store_fd $_[0], $fh;
425	close $fh;
426
427	$buf
428	}
429		512
430	sub fork_call(&@) {	513	sub fork_call(&@) {
431	my ($cb, @args) = @_;	514	my ($cb, @args) = @_;
432		515
433	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	516	# we seemingly have to make a local copy of the whole thing,
434	# or die "socketpair: $!";	517	# otherwise perl prematurely frees the stuff :/
435	pipe my $fh1, my $fh2	518	# TODO: investigate and fix (likely this will be rather laborious)
436	or die "pipe: $!";
437		519
438	if (my $pid = fork) {	520	my @res = Coro::Util::fork_eval {
439	close $fh2;
440
441	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442	warn "pst<$res>" unless $res =~ /^pst/;
443	$res = Coro::Storable::thaw $res;
444
445	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447	Carp::confess $$res unless "ARRAY" eq ref $res;
448
449	return wantarray ? @$res : $res->[-1];
450	} else {
451	reset_signals;	521	reset_signals;
452	local $SIG{__WARN__};	522	&$cb
453	local $SIG{__DIE__};	523	}, @args;
454	# just in case, this hack effectively disables event
455	# in the child. cleaner and slower would be canceling all watchers,
456	# but this works for the time being.
457	local $Coro::idle;
458	$Coro::current->prio (Coro::PRIO_MAX);
459		524
460	eval {	525	wantarray ? @res : $res[-1]
461	close $fh1;
462
463	my @res = eval { $cb->(@args) };
464
465	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466	close $fh2;
467	};
468
469	warn $@ if $@;
470	_exit 0;
471	}
472	}	526	}
473		527
474	=item $value = cf::db_get $family => $key	528	=item $value = cf::db_get $family => $key
475		529
476	Returns a single value from the environment database.	530	Returns a single value from the environment database.
…		…
478	=item cf::db_put $family => $key => $value	532	=item cf::db_put $family => $key => $value
479		533
480	Stores the given C<$value> in the family. It can currently store binary	534	Stores the given C<$value> in the family. It can currently store binary
481	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	535	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482		536
		537	=item $db = cf::db_table "name"
		538
		539	Create and/or open a new database table. The string must not be "db" and must be unique
		540	within each server.
		541
483	=cut	542	=cut
		543
		544	sub db_table($) {
		545	my ($name) = @_;
		546	my $db = BDB::db_create $DB_ENV;
		547
		548	eval {
		549	$db->set_flags (BDB::CHKSUM);
		550
		551	utf8::encode $name;
		552	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		553	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		554	cf::cleanup "db_open(db): $!" if $!;
		555	};
		556	cf::cleanup "db_open(db): $@" if $@;
		557
		558	$db
		559	}
484		560
485	our $DB;	561	our $DB;
486		562
487	sub db_init {	563	sub db_init {
488	unless ($DB) {
489	$DB = BDB::db_create $DB_ENV;
490
491	cf::sync_job {	564	cf::sync_job {
492	eval {	565	$DB ||= db_table "db";
493	$DB->set_flags (BDB::CHKSUM);
494
495	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497	cf::cleanup "db_open(db): $!" if $!;
498	};
499	cf::cleanup "db_open(db): $@" if $@;
500	};
501	}	566	};
502	}	567	}
503		568
504	sub db_get($$) {	569	sub db_get($$) {
505	my $key = "$_[0]/$_[1]";	570	my $key = "$_[0]/$_[1]";
506		571
…		…
556	if (1) {	621	if (1) {
557	$md5 =	622	$md5 =
558	join "\x00",	623	join "\x00",
559	$processversion,	624	$processversion,
560	map {	625	map {
561	Coro::cede;	626	cf::cede_to_tick;
562	($src->[$_], Digest::MD5::md5_hex $data[$_])	627	($src->[$_], Digest::MD5::md5_hex $data[$_])
563	} 0.. $#$src;	628	} 0.. $#$src;
564		629
565		630
566	my $dbmd5 = db_get cache => "$id/md5";	631	my $dbmd5 = db_get cache => "$id/md5";
…		…
610	attach callbacks/event handlers (a collection of which is called an "attachment")	675	attach callbacks/event handlers (a collection of which is called an "attachment")
611	to it. All such attachable objects support the following methods.	676	to it. All such attachable objects support the following methods.
612		677
613	In the following description, CLASS can be any of C<global>, C<object>	678	In the following description, CLASS can be any of C<global>, C<object>
614	C<player>, C<client> or C<map> (i.e. the attachable objects in	679	C<player>, C<client> or C<map> (i.e. the attachable objects in
615	Crossfire TRT).	680	Deliantra).
616		681
617	=over 4	682	=over 4
618		683
619	=item $attachable->attach ($attachment, key => $value...)	684	=item $attachable->attach ($attachment, key => $value...)
620		685
…		…
919	=cut	984	=cut
920		985
921	#############################################################################	986	#############################################################################
922	# object support	987	# object support
923		988
		989	sub _object_equal($$);
		990	sub _object_equal($$) {
		991	my ($a, $b) = @_;
		992
		993	return 0 unless (ref $a) eq (ref $b);
		994
		995	if ("HASH" eq ref $a) {
		996	my @ka = keys %$a;
		997	my @kb = keys %$b;
		998
		999	return 0 if @ka != @kb;
		1000
		1001	for (0 .. $#ka) {
		1002	return 0 unless $ka[$_] eq $kb[$_];
		1003	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1004	}
		1005
		1006	} elsif ("ARRAY" eq ref $a) {
		1007
		1008	return 0 if @$a != @$b;
		1009
		1010	for (0 .. $#$a) {
		1011	return 0 unless _object_equal $a->[$_], $b->[$_];
		1012	}
		1013
		1014	} elsif ($a ne $b) {
		1015	return 0;
		1016	}
		1017
		1018	1
		1019	}
		1020
		1021	our $SLOW_MERGES;#d#
		1022	sub _can_merge {
		1023	my ($ob1, $ob2) = @_;
		1024
		1025	++$SLOW_MERGES;#d#
		1026
		1027	# we do the slow way here
		1028	return _object_equal $ob1, $ob2
		1029	}
		1030
924	sub reattach {	1031	sub reattach {
925	# basically do the same as instantiate, without calling instantiate	1032	# basically do the same as instantiate, without calling instantiate
926	my ($obj) = @_;	1033	my ($obj) = @_;
927		1034
928	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1035	bless $obj, ref $obj; # re-bless in case extensions have been reloaded
…		…
948	cf::attachable->attach (	1055	cf::attachable->attach (
949	prio => -1000000,	1056	prio => -1000000,
950	on_instantiate => sub {	1057	on_instantiate => sub {
951	my ($obj, $data) = @_;	1058	my ($obj, $data) = @_;
952		1059
953	$data = from_json $data;	1060	$data = decode_json $data;
954		1061
955	for (@$data) {	1062	for (@$data) {
956	my ($name, $args) = @$_;	1063	my ($name, $args) = @$_;
957		1064
958	$obj->attach ($name, %{$args || {} });	1065	$obj->attach ($name, %{$args || {} });
…		…
974	sub object_freezer_save {	1081	sub object_freezer_save {
975	my ($filename, $rdata, $objs) = @_;	1082	my ($filename, $rdata, $objs) = @_;
976		1083
977	sync_job {	1084	sync_job {
978	if (length $$rdata) {	1085	if (length $$rdata) {
		1086	utf8::decode (my $decname = $filename);
979	warn sprintf "saving %s (%d,%d)\n",	1087	warn sprintf "saving %s (%d,%d)\n",
980	$filename, length $$rdata, scalar @$objs;	1088	$decname, length $$rdata, scalar @$objs;
981		1089
982	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1090	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983	chmod SAVE_MODE, $fh;	1091	chmod SAVE_MODE, $fh;
984	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1092	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985	aio_fsync $fh if $cf::USE_FSYNC;	1093	aio_fsync $fh if $cf::USE_FSYNC;
986	close $fh;	1094	close $fh;
987		1095
988	if (@$objs) {	1096	if (@$objs) {
989	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1097	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
990	chmod SAVE_MODE, $fh;	1098	chmod SAVE_MODE, $fh;
991	my $data = Storable::nfreeze { version => 1, objs => $objs };	1099	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992	aio_write $fh, 0, (length $data), $data, 0;	1100	aio_write $fh, 0, (length $data), $data, 0;
993	aio_fsync $fh if $cf::USE_FSYNC;	1101	aio_fsync $fh if $cf::USE_FSYNC;
994	close $fh;	1102	close $fh;
995	aio_rename "$filename.pst~", "$filename.pst";	1103	aio_rename "$filename.pst~", "$filename.pst";
996	}	1104	}
…		…
1004	}	1112	}
1005	} else {	1113	} else {
1006	aio_unlink $filename;	1114	aio_unlink $filename;
1007	aio_unlink "$filename.pst";	1115	aio_unlink "$filename.pst";
1008	}	1116	}
1009	}	1117	};
1010	}	1118	}
1011		1119
1012	sub object_freezer_as_string {	1120	sub object_freezer_as_string {
1013	my ($rdata, $objs) = @_;	1121	my ($rdata, $objs) = @_;
1014		1122
…		…
1026	or return;	1134	or return;
1027		1135
1028	unless (aio_stat "$filename.pst") {	1136	unless (aio_stat "$filename.pst") {
1029	(aio_load "$filename.pst", $av) >= 0	1137	(aio_load "$filename.pst", $av) >= 0
1030	or return;	1138	or return;
		1139
1031	$av = eval { (Storable::thaw $av)->{objs} };	1140	my $st = eval { Coro::Storable::thaw $av };
		1141	$av = $st->{objs};
1032	}	1142	}
1033		1143
		1144	utf8::decode (my $decname = $filename);
1034	warn sprintf "loading %s (%d)\n",	1145	warn sprintf "loading %s (%d,%d)\n",
1035	$filename, length $data, scalar @{$av || []};	1146	$decname, length $data, scalar @{$av || []};
		1147
1036	return ($data, $av);	1148	($data, $av)
1037	}	1149	}
1038		1150
1039	=head2 COMMAND CALLBACKS	1151	=head2 COMMAND CALLBACKS
1040		1152
1041	=over 4	1153	=over 4
…		…
1114	my ($pl, $buf) = @_;	1226	my ($pl, $buf) = @_;
1115		1227
1116	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1228	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117		1229
1118	if (ref $msg) {	1230	if (ref $msg) {
		1231	my ($type, $reply, @payload) =
		1232	"ARRAY" eq ref $msg
		1233	? @$msg
		1234	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1235
		1236	my @reply;
		1237
1119	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1238	if (my $cb = $EXTCMD{$type}) {
1120	if (my %reply = $cb->($pl, $msg)) {	1239	@reply = $cb->($pl, @payload);
1121	$pl->ext_reply ($msg->{msgid}, %reply);
1122	}
1123	}	1240	}
		1241
		1242	$pl->ext_reply ($reply, @reply)
		1243	if $reply;
		1244
1124	} else {	1245	} else {
1125	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1246	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126	}	1247	}
1127		1248
1128	cf::override;	1249	cf::override;
…		…
1218		1339
1219	=head3 cf::player	1340	=head3 cf::player
1220		1341
1221	=over 4	1342	=over 4
1222		1343
		1344	=item cf::player::num_playing
		1345
		1346	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1347
		1348	=cut
		1349
		1350	sub num_playing {
		1351	scalar grep
		1352	$_->ob->map
		1353	&& !$_->hidden
		1354	&& !$_->ob->flag (cf::FLAG_WIZ),
		1355	cf::player::list
		1356	}
		1357
1223	=item cf::player::find $login	1358	=item cf::player::find $login
1224		1359
1225	Returns the given player object, loading it if necessary (might block).	1360	Returns the given player object, loading it if necessary (might block).
1226		1361
1227	=cut	1362	=cut
…		…
1262	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1397	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1398	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1399	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265	aio_unlink +(playerdir $login) . "/$login.pl";	1400	aio_unlink +(playerdir $login) . "/$login.pl";
1266		1401
1267	my $pl = load_pl path $login	1402	my $f = new_from_file cf::object::thawer path $login
1268	or return;	1403	or return;
		1404
		1405	my $pl = cf::player::load_pl $f
		1406	or return;
		1407	local $cf::PLAYER_LOADING{$login} = $pl;
		1408	$f->resolve_delayed_derefs;
1269	$cf::PLAYER{$login} = $pl	1409	$cf::PLAYER{$login} = $pl
1270	}	1410	}
1271	}	1411	}
1272	}	1412	}
1273		1413
…		…
1283		1423
1284	aio_mkdir playerdir $pl, 0770;	1424	aio_mkdir playerdir $pl, 0770;
1285	$pl->{last_save} = $cf::RUNTIME;	1425	$pl->{last_save} = $cf::RUNTIME;
1286		1426
1287	$pl->save_pl ($path);	1427	$pl->save_pl ($path);
1288	Coro::cede;	1428	cf::cede_to_tick;
1289	}	1429	}
1290		1430
1291	sub new($) {	1431	sub new($) {
1292	my ($login) = @_;	1432	my ($login) = @_;
1293		1433
…		…
1297	$self->{deny_save} = 1;	1437	$self->{deny_save} = 1;
1298		1438
1299	$cf::PLAYER{$login} = $self;	1439	$cf::PLAYER{$login} = $self;
1300		1440
1301	$self	1441	$self
		1442	}
		1443
		1444	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1445
		1446	=cut
		1447
		1448	sub send_msg {
		1449	my $ns = shift->ns
		1450	or return;
		1451	$ns->send_msg (@_);
1302	}	1452	}
1303		1453
1304	=item $pl->quit_character	1454	=item $pl->quit_character
1305		1455
1306	Nukes the player without looking back. If logged in, the connection will	1456	Nukes the player without looking back. If logged in, the connection will
…		…
1361	or return [];	1511	or return [];
1362		1512
1363	my @logins;	1513	my @logins;
1364		1514
1365	for my $login (@$dirs) {	1515	for my $login (@$dirs) {
		1516	my $path = path $login;
		1517
		1518	# a .pst is a dead give-away for a valid player
		1519	unless (-e "$path.pst") {
1366	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1520	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367	aio_read $fh, 0, 512, my $buf, 0 or next;	1521	aio_read $fh, 0, 512, my $buf, 0 or next;
1368	$buf !~ /^password -------------$/m or next; # official not-valid tag	1522	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1523	}
1369		1524
1370	utf8::decode $login;	1525	utf8::decode $login;
1371	push @logins, $login;	1526	push @logins, $login;
1372	}	1527	}
1373		1528
…		…
1406		1561
1407	Expand crossfire pod fragments into protocol xml.	1562	Expand crossfire pod fragments into protocol xml.
1408		1563
1409	=cut	1564	=cut
1410		1565
		1566	use re 'eval';
		1567
		1568	my $group;
		1569	my $interior; $interior = qr{
		1570	# match a pod interior sequence sans C<< >>
		1571	(?:
		1572	\ (.*?)\ (?{ $group = $^N })
		1573	| < (??{$interior}) >
		1574	)
		1575	}x;
		1576
1411	sub expand_cfpod {	1577	sub expand_cfpod {
1412	((my $self), (local $_)) = @_;	1578	my ($self, $pod) = @_;
1413		1579
1414	# escape & and <	1580	my $xml;
1415	s/&/&amp;/g;
1416	s/(?<![BIUGH])</&lt;/g;
1417		1581
1418	# this is buggy, it needs to properly take care of nested <'s	1582	while () {
		1583	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1584	$group = $1;
1419		1585
1420	1 while	1586	$group =~ s/&/&amp;/g;
1421	# replace B<>, I<>, U<> etc.	1587	$group =~ s/</&lt;/g;
1422	s/B<([^\>]*)>/<b>$1<\/b>/	1588
1423	|| s/I<([^\>]*)>/<i>$1<\/i>/	1589	$xml .= $group;
1424	|| s/U<([^\>]*)>/<u>$1<\/u>/	1590	} elsif ($pod =~ m%\G
1425	# replace G<male|female> tags	1591	([BCGHITU])
1426	|| s{G<([^>|]*)\|([^>]*)>}{	1592	<
1427	$self->gender ? $2 : $1	1593	(?:
1428	}ge	1594	([^<>]*) (?{ $group = $^N })
1429	# replace H<hint text>	1595	| < $interior >
1430	|| s{H<([^\>]*)>}	1596	)
		1597	>
		1598	%gcsx
1431	{	1599	) {
		1600	my ($code, $data) = ($1, $group);
		1601
		1602	if ($code eq "B") {
		1603	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1604	} elsif ($code eq "I") {
		1605	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1606	} elsif ($code eq "U") {
		1607	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1608	} elsif ($code eq "C") {
		1609	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1610	} elsif ($code eq "T") {
		1611	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1612	} elsif ($code eq "G") {
		1613	my ($male, $female) = split /\|/, $data;
		1614	$data = $self->gender ? $female : $male;
		1615	$xml .= expand_cfpod ($self, $data);
		1616	} elsif ($code eq "H") {
1432	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1617	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1433	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1618	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434	"")	1619	"")
1435	[$self->{hintmode}]	1620	[$self->{hintmode}];
		1621	} else {
		1622	$xml .= "error processing '$code($data)' directive";
1436	}ge;	1623	}
		1624	} else {
		1625	if ($pod =~ /\G(.+)/) {
		1626	warn "parse error while expanding $pod (at $1)";
		1627	}
		1628	last;
		1629	}
		1630	}
1437		1631
		1632	for ($xml) {
1438	# create single paragraphs (very hackish)	1633	# create single paragraphs (very hackish)
1439	s/(?<=\S)\n(?=\w)/ /g;	1634	s/(?<=\S)\n(?=\w)/ /g;
1440		1635
1441	# compress some whitespace	1636	# compress some whitespace
1442	s/\s+\n/\n/g; # ws line-ends	1637	s/\s+\n/\n/g; # ws line-ends
1443	s/\n\n+/\n/g; # double lines	1638	s/\n\n+/\n/g; # double lines
1444	s/^\n+//; # beginning lines	1639	s/^\n+//; # beginning lines
1445	s/\n+$//; # ending lines	1640	s/\n+$//; # ending lines
		1641	}
1446		1642
1447	$_	1643	$xml
1448	}	1644	}
		1645
		1646	no re 'eval';
1449		1647
1450	sub hintmode {	1648	sub hintmode {
1451	$_[0]{hintmode} = $_[1] if @_ > 1;	1649	$_[0]{hintmode} = $_[1] if @_ > 1;
1452	$_[0]{hintmode}	1650	$_[0]{hintmode}
1453	}	1651	}
1454		1652
1455	=item $player->ext_reply ($msgid, %msg)	1653	=item $player->ext_reply ($msgid, @msg)
1456		1654
1457	Sends an ext reply to the player.	1655	Sends an ext reply to the player.
1458		1656
1459	=cut	1657	=cut
1460		1658
1461	sub ext_reply($$%) {	1659	sub ext_reply($$@) {
1462	my ($self, $id, %msg) = @_;	1660	my ($self, $id, @msg) = @_;
1463		1661
1464	$msg{msgid} = $id;	1662	$self->ns->ext_reply ($id, @msg)
1465	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466	}	1663	}
1467		1664
1468	=item $player->ext_event ($type, %msg)	1665	=item $player->ext_msg ($type, @msg)
1469		1666
1470	Sends an ext event to the client.	1667	Sends an ext event to the client.
1471		1668
1472	=cut	1669	=cut
1473		1670
1474	sub ext_event($$%) {	1671	sub ext_msg($$@) {
1475	my ($self, $type, %msg) = @_;	1672	my ($self, $type, @msg) = @_;
1476		1673
1477	$self->ns->ext_event ($type, %msg);	1674	$self->ns->ext_msg ($type, @msg);
1478	}	1675	}
1479		1676
1480	=head3 cf::region	1677	=head3 cf::region
1481		1678
1482	=over 4	1679	=over 4
…		…
1698		1895
1699	sub load_header_from($) {	1896	sub load_header_from($) {
1700	my ($self, $path) = @_;	1897	my ($self, $path) = @_;
1701		1898
1702	utf8::encode $path;	1899	utf8::encode $path;
1703	#aio_open $path, O_RDONLY, 0	1900	my $f = new_from_file cf::object::thawer $path
1704	# or return;
1705
1706	$self->_load_header ($path)
1707	or return;	1901	or return;
		1902
		1903	$self->_load_header ($f)
		1904	or return;
		1905
		1906	local $MAP_LOADING{$self->{path}} = $self;
		1907	$f->resolve_delayed_derefs;
1708		1908
1709	$self->{load_path} = $path;	1909	$self->{load_path} = $path;
1710		1910
1711	1	1911	1
1712	}	1912	}
…		…
1766	sub find {	1966	sub find {
1767	my ($path, $origin) = @_;	1967	my ($path, $origin) = @_;
1768		1968
1769	$path = normalise $path, $origin && $origin->path;	1969	$path = normalise $path, $origin && $origin->path;
1770		1970
		1971	cf::lock_wait "map_data:$path";#d#remove
1771	cf::lock_wait "map_find:$path";	1972	cf::lock_wait "map_find:$path";
1772		1973
1773	$cf::MAP{$path} || do {	1974	$cf::MAP{$path} || do {
1774	my $guard = cf::lock_acquire "map_find:$path";	1975	my $guard1 = cf::lock_acquire "map_find:$path";
		1976	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1977
1775	my $map = new_from_path cf::map $path	1978	my $map = new_from_path cf::map $path
1776	or return;	1979	or return;
1777		1980
1778	$map->{last_save} = $cf::RUNTIME;	1981	$map->{last_save} = $cf::RUNTIME;
1779		1982
…		…
1781	or return;	1984	or return;
1782		1985
1783	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1986	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784	# doing this can freeze the server in a sync job, obviously	1987	# doing this can freeze the server in a sync job, obviously
1785	#$cf::WAIT_FOR_TICK->wait;	1988	#$cf::WAIT_FOR_TICK->wait;
		1989	undef $guard1;
		1990	undef $guard2;
1786	$map->reset;	1991	$map->reset;
1787	undef $guard;
1788	return find $path;	1992	return find $path;
1789	}	1993	}
1790		1994
1791	$cf::MAP{$path} = $map	1995	$cf::MAP{$path} = $map
1792	}	1996	}
…		…
1801	local $self->{deny_reset} = 1; # loading can take a long time	2005	local $self->{deny_reset} = 1; # loading can take a long time
1802		2006
1803	my $path = $self->{path};	2007	my $path = $self->{path};
1804		2008
1805	{	2009	{
1806	my $guard = cf::lock_acquire "map_load:$path";	2010	my $guard = cf::lock_acquire "map_data:$path";
1807		2011
		2012	return unless $self->valid;
1808	return if $self->in_memory != cf::MAP_SWAPPED;	2013	return unless $self->in_memory == cf::MAP_SWAPPED;
1809		2014
1810	$self->in_memory (cf::MAP_LOADING);	2015	$self->in_memory (cf::MAP_LOADING);
1811		2016
1812	$self->alloc;	2017	$self->alloc;
1813		2018
1814	$self->pre_load;	2019	$self->pre_load;
1815	Coro::cede;	2020	cf::cede_to_tick;
1816		2021
		2022	my $f = new_from_file cf::object::thawer $self->{load_path};
		2023	$f->skip_block;
1817	$self->_load_objects ($self->{load_path}, 1)	2024	$self->_load_objects ($f)
1818	or return;	2025	or return;
1819		2026
1820	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2027	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821	if delete $self->{load_original};	2028	if delete $self->{load_original};
1822		2029
1823	if (my $uniq = $self->uniq_path) {	2030	if (my $uniq = $self->uniq_path) {
1824	utf8::encode $uniq;	2031	utf8::encode $uniq;
1825	if (aio_open $uniq, O_RDONLY, 0) {	2032	unless (aio_stat $uniq) {
		2033	if (my $f = new_from_file cf::object::thawer $uniq) {
1826	$self->clear_unique_items;	2034	$self->clear_unique_items;
1827	$self->_load_objects ($uniq, 0);	2035	$self->_load_objects ($f);
		2036	$f->resolve_delayed_derefs;
		2037	}
1828	}	2038	}
1829	}	2039	}
1830		2040
1831	Coro::cede;	2041	$f->resolve_delayed_derefs;
		2042
		2043	cf::cede_to_tick;
1832	# now do the right thing for maps	2044	# now do the right thing for maps
1833	$self->link_multipart_objects;	2045	$self->link_multipart_objects;
1834	$self->difficulty ($self->estimate_difficulty)	2046	$self->difficulty ($self->estimate_difficulty)
1835	unless $self->difficulty;	2047	unless $self->difficulty;
1836	Coro::cede;	2048	cf::cede_to_tick;
1837		2049
1838	unless ($self->{deny_activate}) {	2050	unless ($self->{deny_activate}) {
1839	$self->decay_objects;	2051	$self->decay_objects;
1840	$self->fix_auto_apply;	2052	$self->fix_auto_apply;
1841	$self->update_buttons;	2053	$self->update_buttons;
1842	Coro::cede;	2054	cf::cede_to_tick;
1843	$self->set_darkness_map;	2055	$self->set_darkness_map;
1844	Coro::cede;	2056	cf::cede_to_tick;
1845	$self->activate;	2057	$self->activate;
1846	}	2058	}
		2059
		2060	$self->{last_save} = $cf::RUNTIME;
		2061	$self->last_access ($cf::RUNTIME);
1847		2062
1848	$self->in_memory (cf::MAP_IN_MEMORY);	2063	$self->in_memory (cf::MAP_IN_MEMORY);
1849	}	2064	}
1850		2065
1851	$self->post_load;	2066	$self->post_load;
…		…
1862		2077
1863	$self	2078	$self
1864	}	2079	}
1865		2080
1866	# find and load all maps in the 3x3 area around a map	2081	# find and load all maps in the 3x3 area around a map
1867	sub load_diag {	2082	sub load_neighbours {
1868	my ($map) = @_;	2083	my ($map) = @_;
1869		2084
1870	my @diag; # diagonal neighbours	2085	my @neigh; # diagonal neighbours
1871		2086
1872	for (0 .. 3) {	2087	for (0 .. 3) {
1873	my $neigh = $map->tile_path ($_)	2088	my $neigh = $map->tile_path ($_)
1874	or next;	2089	or next;
1875	$neigh = find $neigh, $map	2090	$neigh = find $neigh, $map
1876	or next;	2091	or next;
1877	$neigh->load;	2092	$neigh->load;
1878		2093
		2094	push @neigh,
1879	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2095	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1880	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2096	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1881	}	2097	}
1882		2098
1883	for (@diag) {	2099	for (grep defined $_->[0], @neigh) {
		2100	my ($path, $origin) = @$_;
1884	my $neigh = find @$_	2101	my $neigh = find $path, $origin
1885	or next;	2102	or next;
1886	$neigh->load;	2103	$neigh->load;
1887	}	2104	}
1888	}	2105	}
1889		2106
…		…
1894	}	2111	}
1895		2112
1896	sub do_load_sync {	2113	sub do_load_sync {
1897	my ($map) = @_;	2114	my ($map) = @_;
1898		2115
		2116	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2117	if $Coro::current == $Coro::main;
		2118
1899	cf::sync_job { $map->load };	2119	cf::sync_job { $map->load };
1900	}	2120	}
1901		2121
1902	our %MAP_PREFETCH;	2122	our %MAP_PREFETCH;
1903	our $MAP_PREFETCHER = undef;	2123	our $MAP_PREFETCHER = undef;
1904		2124
1905	sub find_async {	2125	sub find_async {
1906	my ($path, $origin) = @_;	2126	my ($path, $origin, $load) = @_;
1907		2127
1908	$path = normalise $path, $origin && $origin->{path};	2128	$path = normalise $path, $origin && $origin->{path};
1909		2129
1910	if (my $map = $cf::MAP{$path}) {	2130	if (my $map = $cf::MAP{$path}) {
1911	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2131	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912	}	2132	}
1913		2133
1914	undef $MAP_PREFETCH{$path};	2134	$MAP_PREFETCH{$path} |= $load;
		2135
1915	$MAP_PREFETCHER ||= cf::async {	2136	$MAP_PREFETCHER ||= cf::async {
		2137	$Coro::current->{desc} = "map prefetcher";
		2138
1916	while (%MAP_PREFETCH) {	2139	while (%MAP_PREFETCH) {
1917	for my $path (keys %MAP_PREFETCH) {	2140	while (my ($k, $v) = each %MAP_PREFETCH) {
1918	if (my $map = find $path) {	2141	if (my $map = find $k) {
1919	$map->load;	2142	$map->load if $v;
1920	}	2143	}
1921		2144
1922	delete $MAP_PREFETCH{$path};	2145	delete $MAP_PREFETCH{$k};
1923	}	2146	}
1924	}	2147	}
1925	undef $MAP_PREFETCHER;	2148	undef $MAP_PREFETCHER;
1926	};	2149	};
1927	$MAP_PREFETCHER->prio (6);	2150	$MAP_PREFETCHER->prio (6);
…		…
1930	}	2153	}
1931		2154
1932	sub save {	2155	sub save {
1933	my ($self) = @_;	2156	my ($self) = @_;
1934		2157
1935	my $lock = cf::lock_acquire "map_data:" . $self->path;	2158	my $lock = cf::lock_acquire "map_data:$self->{path}";
1936		2159
1937	$self->{last_save} = $cf::RUNTIME;	2160	$self->{last_save} = $cf::RUNTIME;
1938		2161
1939	return unless $self->dirty;	2162	return unless $self->dirty;
1940		2163
…		…
1946	return if $self->{deny_save};	2169	return if $self->{deny_save};
1947		2170
1948	local $self->{last_access} = $self->last_access;#d#	2171	local $self->{last_access} = $self->last_access;#d#
1949		2172
1950	cf::async {	2173	cf::async {
		2174	$Coro::current->{desc} = "map player save";
1951	$_->contr->save for $self->players;	2175	$_->contr->save for $self->players;
1952	};	2176	};
1953		2177
1954	if ($uniq) {	2178	if ($uniq) {
1955	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2179	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1963	my ($self) = @_;	2187	my ($self) = @_;
1964		2188
1965	# save first because save cedes	2189	# save first because save cedes
1966	$self->save;	2190	$self->save;
1967		2191
1968	my $lock = cf::lock_acquire "map_data:" . $self->path;	2192	my $lock = cf::lock_acquire "map_data:$self->{path}";
1969		2193
1970	return if $self->players;	2194	return if $self->players;
1971	return if $self->in_memory != cf::MAP_IN_MEMORY;	2195	return if $self->in_memory != cf::MAP_IN_MEMORY;
1972	return if $self->{deny_save};	2196	return if $self->{deny_save};
1973		2197
		2198	$self->in_memory (cf::MAP_SWAPPED);
		2199
		2200	$self->deactivate;
		2201	$_->clear_links_to ($self) for values %cf::MAP;
1974	$self->clear;	2202	$self->clear;
1975	$self->in_memory (cf::MAP_SWAPPED);
1976	}	2203	}
1977		2204
1978	sub reset_at {	2205	sub reset_at {
1979	my ($self) = @_;	2206	my ($self) = @_;
1980		2207
…		…
2012	if $uniq;	2239	if $uniq;
2013	}	2240	}
2014		2241
2015	delete $cf::MAP{$self->path};	2242	delete $cf::MAP{$self->path};
2016		2243
		2244	$self->deactivate;
		2245	$_->clear_links_to ($self) for values %cf::MAP;
2017	$self->clear;	2246	$self->clear;
2018
2019	$_->clear_links_to ($self) for values %cf::MAP;
2020		2247
2021	$self->unlink_save;	2248	$self->unlink_save;
2022	$self->destroy;	2249	$self->destroy;
2023	}	2250	}
2024		2251
2025	my $nuke_counter = "aaaa";	2252	my $nuke_counter = "aaaa";
2026		2253
2027	sub nuke {	2254	sub nuke {
2028	my ($self) = @_;	2255	my ($self) = @_;
2029		2256
		2257	{
		2258	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2259
2030	delete $cf::MAP{$self->path};	2260	delete $cf::MAP{$self->path};
2031		2261
2032	$self->unlink_save;	2262	$self->unlink_save;
2033		2263
2034	bless $self, "cf::map";	2264	bless $self, "cf::map";
2035	delete $self->{deny_reset};	2265	delete $self->{deny_reset};
2036	$self->{deny_save} = 1;	2266	$self->{deny_save} = 1;
2037	$self->reset_timeout (1);	2267	$self->reset_timeout (1);
2038	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2268	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039		2269
2040	$cf::MAP{$self->path} = $self;	2270	$cf::MAP{$self->path} = $self;
		2271	}
2041		2272
2042	$self->reset; # polite request, might not happen	2273	$self->reset; # polite request, might not happen
2043	}	2274	}
2044		2275
2045	=item $maps = cf::map::tmp_maps	2276	=item $maps = cf::map::tmp_maps
…		…
2121		2352
2122	sub inv_recursive {	2353	sub inv_recursive {
2123	inv_recursive_ inv $_[0]	2354	inv_recursive_ inv $_[0]
2124	}	2355	}
2125		2356
		2357	=item $ref = $ob->ref
		2358
		2359	creates and returns a persistent reference to an objetc that can be stored as a string.
		2360
		2361	=item $ob = cf::object::deref ($refstring)
		2362
		2363	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2364	even if the object actually exists. May block.
		2365
		2366	=cut
		2367
		2368	sub deref {
		2369	my ($ref) = @_;
		2370
		2371	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2372	my ($uuid, $name) = ($1, $2);
		2373	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2374	or return;
		2375	$pl->ob->uuid eq $uuid
		2376	or return;
		2377
		2378	$pl->ob
		2379	} else {
		2380	warn "$ref: cannot resolve object reference\n";
		2381	undef
		2382	}
		2383	}
		2384
2126	package cf;	2385	package cf;
2127		2386
2128	=back	2387	=back
2129		2388
2130	=head3 cf::object::player	2389	=head3 cf::object::player
…		…
2152		2411
2153	} else {	2412	} else {
2154	my $pl = $self->contr;	2413	my $pl = $self->contr;
2155		2414
2156	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2415	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157	my $diag = $pl->{npc_dialog};	2416	my $dialog = $pl->{npc_dialog};
2158	$diag->{pl}->ext_reply (	2417	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159	$diag->{id},
2160	msgtype => "reply",
2161	msg => $diag->{pl}->expand_cfpod ($msg),
2162	add_topics => []
2163	);
2164		2418
2165	} else {	2419	} else {
2166	$msg = $npc->name . " says: $msg" if $npc;	2420	$msg = $npc->name . " says: $msg" if $npc;
2167	$self->message ($msg, $flags);	2421	$self->message ($msg, $flags);
2168	}	2422	}
2169	}	2423	}
		2424	}
		2425
		2426	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2427
		2428	=cut
		2429
		2430	sub cf::object::send_msg {
		2431	my $pl = shift->contr
		2432	or return;
		2433	$pl->send_msg (@_);
2170	}	2434	}
2171		2435
2172	=item $player_object->may ("access")	2436	=item $player_object->may ("access")
2173		2437
2174	Returns wether the given player is authorized to access resource "access"	2438	Returns wether the given player is authorized to access resource "access"
…		…
2253	# use -1 or undef as default coordinates, not 0, 0	2517	# use -1 or undef as default coordinates, not 0, 0
2254	($x, $y) = ($map->enter_x, $map->enter_y)	2518	($x, $y) = ($map->enter_x, $map->enter_y)
2255	if $x <=0 && $y <= 0;	2519	if $x <=0 && $y <= 0;
2256		2520
2257	$map->load;	2521	$map->load;
2258	$map->load_diag;	2522	$map->load_neighbours;
2259		2523
2260	return unless $self->contr->active;	2524	return unless $self->contr->active;
2261	$self->activate_recursive;	2525	$self->activate_recursive;
2262		2526
2263	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2527	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2283	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2547	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284		2548
2285	$self->enter_link;	2549	$self->enter_link;
2286		2550
2287	(async {	2551	(async {
		2552	$Coro::current->{desc} = "player::goto $path $x $y";
		2553
		2554	# *tag paths override both path and x|y
		2555	if ($path =~ /^\*(.*)$/) {
		2556	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2557	my $ob = $obs[rand @obs];
		2558
		2559	# see if we actually can go there
		2560	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2561	$ob = $obs[rand @obs];
		2562	} else {
		2563	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2564	}
		2565	# else put us there anyways for now #d#
		2566
		2567	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2568	} else {
		2569	($path, $x, $y) = (undef, undef, undef);
		2570	}
		2571	}
		2572
2288	my $map = eval {	2573	my $map = eval {
2289	my $map = cf::map::find $path;	2574	my $map = defined $path ? cf::map::find $path : undef;
2290		2575
2291	if ($map) {	2576	if ($map) {
2292	$map = $map->customise_for ($self);	2577	$map = $map->customise_for ($self);
2293	$map = $check->($map) if $check && $map;	2578	$map = $check->($map) if $check && $map;
2294	} else {	2579	} else {
2295	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2580	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296	}	2581	}
2297		2582
2298	$map	2583	$map
2299	};	2584	};
2300		2585
…		…
2353	$rmp->{origin_y} = $exit->y;	2638	$rmp->{origin_y} = $exit->y;
2354	}	2639	}
2355		2640
2356	$rmp->{random_seed} ||= $exit->random_seed;	2641	$rmp->{random_seed} ||= $exit->random_seed;
2357		2642
2358	my $data = cf::to_json $rmp;	2643	my $data = cf::encode_json $rmp;
2359	my $md5 = Digest::MD5::md5_hex $data;	2644	my $md5 = Digest::MD5::md5_hex $data;
2360	my $meta = "$RANDOMDIR/$md5.meta";	2645	my $meta = "$RANDOMDIR/$md5.meta";
2361		2646
2362	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2647	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363	aio_write $fh, 0, (length $data), $data, 0;	2648	aio_write $fh, 0, (length $data), $data, 0;
…		…
2390	# if exit is damned, update players death & WoR home-position	2675	# if exit is damned, update players death & WoR home-position
2391	$self->contr->savebed ($slaying, $hp, $sp)	2676	$self->contr->savebed ($slaying, $hp, $sp)
2392	if $exit->flag (FLAG_DAMNED);	2677	if $exit->flag (FLAG_DAMNED);
2393		2678
2394	(async {	2679	(async {
		2680	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2681
2395	$self->deactivate_recursive; # just to be sure	2682	$self->deactivate_recursive; # just to be sure
2396	unless (eval {	2683	unless (eval {
2397	$self->goto ($slaying, $hp, $sp);	2684	$self->goto ($slaying, $hp, $sp);
2398		2685
2399	1;	2686	1;
…		…
2434	the message, with C<log> being the default. If C<$color> is negative, suppress	2721	the message, with C<log> being the default. If C<$color> is negative, suppress
2435	the message unless the client supports the msg packet.	2722	the message unless the client supports the msg packet.
2436		2723
2437	=cut	2724	=cut
2438		2725
		2726	# non-persistent channels (usually the info channel)
		2727	our %CHANNEL = (
		2728	"c/identify" => {
		2729	id => "infobox",
		2730	title => "Identify",
		2731	reply => undef,
		2732	tooltip => "Items recently identified",
		2733	},
		2734	"c/examine" => {
		2735	id => "infobox",
		2736	title => "Examine",
		2737	reply => undef,
		2738	tooltip => "Signs and other items you examined",
		2739	},
		2740	"c/book" => {
		2741	id => "infobox",
		2742	title => "Book",
		2743	reply => undef,
		2744	tooltip => "The contents of a note or book",
		2745	},
		2746	"c/lookat" => {
		2747	id => "infobox",
		2748	title => "Look",
		2749	reply => undef,
		2750	tooltip => "What you saw there",
		2751	},
		2752	"c/who" => {
		2753	id => "infobox",
		2754	title => "Players",
		2755	reply => undef,
		2756	tooltip => "Shows players who are currently online",
		2757	},
		2758	"c/body" => {
		2759	id => "infobox",
		2760	title => "Body Parts",
		2761	reply => undef,
		2762	tooltip => "Shows which body parts you posess and are available",
		2763	},
		2764	"c/uptime" => {
		2765	id => "infobox",
		2766	title => "Uptime",
		2767	reply => undef,
		2768	tooltip => "How long the server has been running since last restart",
		2769	},
		2770	"c/mapinfo" => {
		2771	id => "infobox",
		2772	title => "Map Info",
		2773	reply => undef,
		2774	tooltip => "Information related to the maps",
		2775	},
		2776	);
		2777
2439	sub cf::client::send_msg {	2778	sub cf::client::send_msg {
2440	my ($self, $channel, $msg, $color, @extra) = @_;	2779	my ($self, $channel, $msg, $color, @extra) = @_;
2441		2780
2442	$msg = $self->pl->expand_cfpod ($msg);	2781	$msg = $self->pl->expand_cfpod ($msg);
2443		2782
2444	return unless @extra || length $msg;
2445
2446	$color &= ~cf::NDI_UNIQUE; # just in case...	2783	$color &= cf::NDI_CLIENT_MASK; # just in case...
2447		2784
		2785	# check predefined channels, for the benefit of C
		2786	if ($CHANNEL{$channel}) {
		2787	$channel = $CHANNEL{$channel};
		2788
		2789	$self->ext_msg (channel_info => $channel)
		2790	if $self->can_msg;
		2791
		2792	$channel = $channel->{id};
		2793
2448	if (ref $channel) {	2794	} elsif (ref $channel) {
2449	# send meta info to client, if not yet sent	2795	# send meta info to client, if not yet sent
2450	unless (exists $self->{channel}{$channel->{id}}) {	2796	unless (exists $self->{channel}{$channel->{id}}) {
2451	$self->{channel}{$channel->{id}} = $channel;	2797	$self->{channel}{$channel->{id}} = $channel;
2452	$self->ext_event (channel_info => %$channel);	2798	$self->ext_msg (channel_info => $channel)
		2799	if $self->can_msg;
2453	}	2800	}
2454		2801
2455	$channel = $channel->{id};	2802	$channel = $channel->{id};
2456	}	2803	}
2457		2804
		2805	return unless @extra || length $msg;
		2806
2458	if ($self->can_msg) {	2807	if ($self->can_msg) {
		2808	# default colour, mask it out
		2809	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2810	if $color & cf::NDI_DEF;
		2811
2459	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	2812	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2813	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460	} else {	2814	} else {
2461	# replace some tags by gcfclient-compatible ones
2462	for ($msg) {
2463	1 while
2464	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469	}
2470
2471	if ($color >= 0) {	2815	if ($color >= 0) {
		2816	# replace some tags by gcfclient-compatible ones
		2817	for ($msg) {
		2818	1 while
		2819	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2820	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2821	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2822	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2823	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2824	}
		2825
		2826	$color &= cf::NDI_COLOR_MASK;
		2827
		2828	utf8::encode $msg;
		2829
2472	if (0 && $msg =~ /\[/) {	2830	if (0 && $msg =~ /\[/) {
		2831	# COMMAND/INFO
2473	$self->send_packet ("drawextinfo $color 4 0 $msg")	2832	$self->send_packet ("drawextinfo $color 10 8 $msg")
2474	} else {	2833	} else {
2475	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2834	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476	$self->send_packet ("drawinfo $color $msg")	2835	$self->send_packet ("drawinfo $color $msg")
2477	}	2836	}
2478	}	2837	}
2479	}	2838	}
2480	}	2839	}
2481		2840
2482	=item $client->ext_event ($type, %msg)	2841	=item $client->ext_msg ($type, @msg)
2483		2842
2484	Sends an ext event to the client.	2843	Sends an ext event to the client.
2485		2844
2486	=cut	2845	=cut
2487		2846
2488	sub cf::client::ext_event($$%) {	2847	sub cf::client::ext_msg($$@) {
2489	my ($self, $type, %msg) = @_;	2848	my ($self, $type, @msg) = @_;
2490		2849
2491	return unless $self->extcmd;	2850	if ($self->extcmd == 2) {
2492		2851	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2852	} elsif ($self->extcmd == 1) { # TODO: remove
2493	$msg{msgtype} = "event_$type";	2853	push @msg, msgtype => "event_$type";
2494	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2854	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2855	}
		2856	}
		2857
		2858	=item $client->ext_reply ($msgid, @msg)
		2859
		2860	Sends an ext reply to the client.
		2861
		2862	=cut
		2863
		2864	sub cf::client::ext_reply($$@) {
		2865	my ($self, $id, @msg) = @_;
		2866
		2867	if ($self->extcmd == 2) {
		2868	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2869	} elsif ($self->extcmd == 1) {
		2870	#TODO: version 1, remove
		2871	unshift @msg, msgtype => "reply", msgid => $id;
		2872	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2873	}
2495	}	2874	}
2496		2875
2497	=item $success = $client->query ($flags, "text", \&cb)	2876	=item $success = $client->query ($flags, "text", \&cb)
2498		2877
2499	Queues a query to the client, calling the given callback with	2878	Queues a query to the client, calling the given callback with
…		…
2554	my ($ns, $buf) = @_;	2933	my ($ns, $buf) = @_;
2555		2934
2556	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2935	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557		2936
2558	if (ref $msg) {	2937	if (ref $msg) {
		2938	my ($type, $reply, @payload) =
		2939	"ARRAY" eq ref $msg
		2940	? @$msg
		2941	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2942
		2943	my @reply;
		2944
2559	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2945	if (my $cb = $EXTICMD{$type}) {
2560	if (my %reply = $cb->($ns, $msg)) {	2946	@reply = $cb->($ns, @payload);
2561	$reply{msgid} = $msg->{msgid};
2562	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563	}
2564	}	2947	}
		2948
		2949	$ns->ext_reply ($reply, @reply)
		2950	if $reply;
		2951
2565	} else {	2952	} else {
2566	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2953	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567	}	2954	}
2568		2955
2569	cf::override;	2956	cf::override;
…		…
2616	our $safe = new Safe "safe";	3003	our $safe = new Safe "safe";
2617	our $safe_hole = new Safe::Hole;	3004	our $safe_hole = new Safe::Hole;
2618		3005
2619	$SIG{FPE} = 'IGNORE';	3006	$SIG{FPE} = 'IGNORE';
2620		3007
2621	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	3008	$safe->permit_only (Opcode::opset qw(
		3009	:base_core :base_mem :base_orig :base_math
		3010	grepstart grepwhile mapstart mapwhile
		3011	sort time
		3012	));
2622		3013
2623	# here we export the classes and methods available to script code	3014	# here we export the classes and methods available to script code
2624		3015
2625	=pod	3016	=pod
2626		3017
2627	The following functions and methods are available within a safe environment:	3018	The following functions and methods are available within a safe environment:
2628		3019
2629	cf::object	3020	cf::object
2630	contr pay_amount pay_player map x y force_find force_add	3021	contr pay_amount pay_player map x y force_find force_add destroy
2631	insert remove	3022	insert remove name archname title slaying race decrease_ob_nr
2632		3023
2633	cf::object::player	3024	cf::object::player
2634	player	3025	player
2635		3026
2636	cf::player	3027	cf::player
…		…
2641		3032
2642	=cut	3033	=cut
2643		3034
2644	for (	3035	for (
2645	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3036	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3037	insert remove inv name archname title slaying race
2646	insert remove)],	3038	decrease_ob_nr destroy)],
2647	["cf::object::player" => qw(player)],	3039	["cf::object::player" => qw(player)],
2648	["cf::player" => qw(peaceful)],	3040	["cf::player" => qw(peaceful)],
2649	["cf::map" => qw(trigger)],	3041	["cf::map" => qw(trigger)],
2650	) {	3042	) {
2651	no strict 'refs';	3043	no strict 'refs';
…		…
2727	# the server's init and main functions	3119	# the server's init and main functions
2728		3120
2729	sub load_facedata($) {	3121	sub load_facedata($) {
2730	my ($path) = @_;	3122	my ($path) = @_;
2731		3123
		3124	# HACK to clear player env face cache, we need some signal framework
		3125	# for this (global event?)
		3126	%ext::player_env::MUSIC_FACE_CACHE = ();
		3127
		3128	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3129
2732	warn "loading facedata from $path\n";	3130	warn "loading facedata from $path\n";
2733		3131
2734	my $facedata;	3132	my $facedata;
2735	0 < aio_load $path, $facedata	3133	0 < aio_load $path, $facedata
2736	or die "$path: $!";	3134	or die "$path: $!";
2737		3135
2738	$facedata = Coro::Storable::thaw $facedata;	3136	$facedata = Coro::Storable::thaw $facedata;
2739		3137
2740	$facedata->{version} == 2	3138	$facedata->{version} == 2
2741	or cf::cleanup "$path: version mismatch, cannot proceed.";	3139	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3140
		3141	# patch in the exptable
		3142	$facedata->{resource}{"res/exp_table"} = {
		3143	type => FT_RSRC,
		3144	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3145	};
		3146	cf::cede_to_tick;
2742		3147
2743	{	3148	{
2744	my $faces = $facedata->{faceinfo};	3149	my $faces = $facedata->{faceinfo};
2745		3150
2746	while (my ($face, $info) = each %$faces) {	3151	while (my ($face, $info) = each %$faces) {
2747	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3152	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2748	cf::face::set_visibility $idx, $info->{visibility};	3153	cf::face::set_visibility $idx, $info->{visibility};
2749	cf::face::set_magicmap $idx, $info->{magicmap};	3154	cf::face::set_magicmap $idx, $info->{magicmap};
2750	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3155	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3156	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752		3157
2753	cf::cede_to_tick;	3158	cf::cede_to_tick;
2754	}	3159	}
2755		3160
2756	while (my ($face, $info) = each %$faces) {	3161	while (my ($face, $info) = each %$faces) {
…		…
2781		3186
2782	{	3187	{
2783	# TODO: for gcfclient pleasure, we should give resources	3188	# TODO: for gcfclient pleasure, we should give resources
2784	# that gcfclient doesn't grok a >10000 face index.	3189	# that gcfclient doesn't grok a >10000 face index.
2785	my $res = $facedata->{resource};	3190	my $res = $facedata->{resource};
2786	my $enc = JSON::XS->new->utf8->canonical;	3191
		3192	my $soundconf = delete $res->{"res/sound.conf"};
2787		3193
2788	while (my ($name, $info) = each %$res) {	3194	while (my ($name, $info) = each %$res) {
2789	my $meta = $enc->encode ({
2790	name => $name,
2791	type => $info->{type},
2792	copyright => $info->{copyright}, #TODO#
2793	});
2794
2795	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3195	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3196	my $data;
2796		3197
2797	if ($name =~ /\.jpg$/) {	3198	if ($info->{type} & 1) {
2798	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3199	# prepend meta info
2799	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3200
		3201	my $meta = $enc->encode ({
		3202	name => $name,
		3203	%{ $info->{meta} || {} },
		3204	});
		3205
		3206	$data = pack "(w/a*)*", $meta, $info->{data};
2800	} else {	3207	} else {
2801	my $data = pack "(w/a*)*", $meta, $info->{data};	3208	$data = $info->{data};
2802	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804	cf::face::set_type $idx, 1;
2805	cf::face::set_data $idx, 0, $data, $chk;
2806	}	3209	}
2807		3210
		3211	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3212	cf::face::set_type $idx, $info->{type};
		3213
2808	cf::cede_to_tick;	3214	cf::cede_to_tick;
2809	}	3215	}
		3216
		3217	if ($soundconf) {
		3218	$soundconf = $enc->decode (delete $soundconf->{data});
		3219
		3220	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3221	my $sound = $soundconf->{compat}[$_]
		3222	or next;
		3223
		3224	my $face = cf::face::find "sound/$sound->[1]";
		3225	cf::sound::set $sound->[0] => $face;
		3226	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3227	}
		3228
		3229	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3230	my $face = cf::face::find "sound/$v";
		3231	cf::sound::set $k => $face;
		3232	}
		3233	}
2810	}	3234	}
2811		3235
2812	1	3236	1
2813	}	3237	}
2814		3238
		3239	register_exticmd fx_want => sub {
		3240	my ($ns, $want) = @_;
		3241
		3242	while (my ($k, $v) = each %$want) {
		3243	$ns->fx_want ($k, $v);
		3244	}
		3245	};
		3246
2815	sub reload_regions {	3247	sub reload_regions {
		3248	# HACK to clear player env face cache, we need some signal framework
		3249	# for this (global event?)
		3250	%ext::player_env::MUSIC_FACE_CACHE = ();
		3251
2816	load_resource_file "$MAPDIR/regions"	3252	load_resource_file "$MAPDIR/regions"
2817	or die "unable to load regions file\n";	3253	or die "unable to load regions file\n";
2818		3254
2819	for (cf::region::list) {	3255	for (cf::region::list) {
2820	$_->{match} = qr/$_->{match}/	3256	$_->{match} = qr/$_->{match}/
…		…
2856		3292
2857	sub init {	3293	sub init {
2858	reload_resources;	3294	reload_resources;
2859	}	3295	}
2860		3296
2861	sub cfg_load {	3297	sub reload_config {
2862	open my $fh, "<:utf8", "$CONFDIR/config"	3298	open my $fh, "<:utf8", "$CONFDIR/config"
2863	or return;	3299	or return;
2864		3300
2865	local $/;	3301	local $/;
2866	*CFG = YAML::Syck::Load <$fh>;	3302	*CFG = YAML::Syck::Load <$fh>;
…		…
2882	sub main {	3318	sub main {
2883	# we must not ever block the main coroutine	3319	# we must not ever block the main coroutine
2884	local $Coro::idle = sub {	3320	local $Coro::idle = sub {
2885	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3321	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886	(async {	3322	(async {
2887	Event::one_event;	3323	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3324	EV::loop EV::LOOP_ONESHOT;
2888	})->prio (Coro::PRIO_MAX);	3325	})->prio (Coro::PRIO_MAX);
2889	};	3326	};
2890		3327
2891	cfg_load;	3328	reload_config;
2892	db_init;	3329	db_init;
2893	load_extensions;	3330	load_extensions;
2894		3331
2895	$TICK_WATCHER->start;	3332	$TICK_WATCHER->start;
		3333	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2896	Event::loop;	3334	EV::loop;
2897	}	3335	}
2898		3336
2899	#############################################################################	3337	#############################################################################
2900	# initialisation and cleanup	3338	# initialisation and cleanup
2901		3339
2902	# install some emergency cleanup handlers	3340	# install some emergency cleanup handlers
2903	BEGIN {	3341	BEGIN {
		3342	our %SIGWATCHER = ();
2904	for my $signal (qw(INT HUP TERM)) {	3343	for my $signal (qw(INT HUP TERM)) {
2905	Event->signal (	3344	$SIGWATCHER{$signal} = EV::signal $signal, sub {
2906	reentrant => 0,
2907	data => WF_AUTOCANCEL,
2908	signal => $signal,
2909	prio => 0,
2910	cb => sub {
2911	cf::cleanup "SIG$signal";	3345	cf::cleanup "SIG$signal";
2912	},
2913	);	3346	};
2914	}	3347	}
2915	}	3348	}
2916		3349
2917	sub write_runtime {	3350	sub write_runtime {
2918	my $runtime = "$LOCALDIR/runtime";	3351	my $runtime = "$LOCALDIR/runtime";
…		…
2963	# and maps saved/destroyed asynchronously.	3396	# and maps saved/destroyed asynchronously.
2964	warn "begin emergency player save\n";	3397	warn "begin emergency player save\n";
2965	for my $login (keys %cf::PLAYER) {	3398	for my $login (keys %cf::PLAYER) {
2966	my $pl = $cf::PLAYER{$login} or next;	3399	my $pl = $cf::PLAYER{$login} or next;
2967	$pl->valid or next;	3400	$pl->valid or next;
		3401	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968	$pl->save;	3402	$pl->save;
2969	}	3403	}
2970	warn "end emergency player save\n";	3404	warn "end emergency player save\n";
2971		3405
2972	warn "begin emergency map save\n";	3406	warn "begin emergency map save\n";
…		…
3011	warn "syncing database to disk";	3445	warn "syncing database to disk";
3012	BDB::db_env_txn_checkpoint $DB_ENV;	3446	BDB::db_env_txn_checkpoint $DB_ENV;
3013		3447
3014	# if anything goes wrong in here, we should simply crash as we already saved	3448	# if anything goes wrong in here, we should simply crash as we already saved
3015		3449
3016	warn "cancelling all WF_AUTOCANCEL watchers";
3017	for (Event::all_watchers) {
3018	$_->cancel if $_->data & WF_AUTOCANCEL;
3019	}
3020
3021	warn "flushing outstanding aio requests";	3450	warn "flushing outstanding aio requests";
3022	for (;;) {	3451	for (;;) {
3023	BDB::flush;	3452	BDB::flush;
3024	IO::AIO::flush;	3453	IO::AIO::flush;
3025	Coro::cede;	3454	Coro::cede_notself;
3026	last unless IO::AIO::nreqs || BDB::nreqs;	3455	last unless IO::AIO::nreqs || BDB::nreqs;
3027	warn "iterate...";	3456	warn "iterate...";
3028	}	3457	}
3029		3458
3030	++$RELOAD;	3459	++$RELOAD;
…		…
3089	warn "reloading cf.pm";	3518	warn "reloading cf.pm";
3090	require cf;	3519	require cf;
3091	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3520	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092		3521
3093	warn "loading config and database again";	3522	warn "loading config and database again";
3094	cf::cfg_load;	3523	cf::reload_config;
3095		3524
3096	warn "loading extensions";	3525	warn "loading extensions";
3097	cf::load_extensions;	3526	cf::load_extensions;
3098		3527
3099	warn "reattaching attachments to objects/players";	3528	warn "reattaching attachments to objects/players";
…		…
3119		3548
3120	sub reload_perl() {	3549	sub reload_perl() {
3121	# doing reload synchronously and two reloads happen back-to-back,	3550	# doing reload synchronously and two reloads happen back-to-back,
3122	# coro crashes during coro_state_free->destroy here.	3551	# coro crashes during coro_state_free->destroy here.
3123		3552
3124	$RELOAD_WATCHER ||= Event->timer (	3553	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3125	reentrant => 0,
3126	after => 0,
3127	data => WF_AUTOCANCEL,
3128	cb => sub {
3129	do_reload_perl;
3130	undef $RELOAD_WATCHER;	3554	undef $RELOAD_WATCHER;
3131	},	3555	do_reload_perl;
3132	);	3556	};
3133	}	3557	}
3134		3558
3135	register_command "reload" => sub {	3559	register_command "reload" => sub {
3136	my ($who, $arg) = @_;	3560	my ($who, $arg) = @_;
3137		3561
3138	if ($who->flag (FLAG_WIZ)) {	3562	if ($who->flag (FLAG_WIZ)) {
3139	$who->message ("reloading server.");	3563	$who->message ("reloading server.");
		3564	async {
		3565	$Coro::current->{desc} = "perl_reload";
3140	async { reload_perl };	3566	reload_perl;
		3567	};
3141	}	3568	}
3142	};	3569	};
3143		3570
3144	unshift @INC, $LIBDIR;	3571	unshift @INC, $LIBDIR;
3145		3572
…		…
3164	my $signal = new Coro::Signal;	3591	my $signal = new Coro::Signal;
3165	push @WAIT_FOR_TICK_BEGIN, $signal;	3592	push @WAIT_FOR_TICK_BEGIN, $signal;
3166	$signal->wait;	3593	$signal->wait;
3167	}	3594	}
3168		3595
3169	my $min = 1e6;#d#	3596	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3170	my $avg = 10;
3171	$TICK_WATCHER = Event->timer (
3172	reentrant => 0,
3173	parked => 1,
3174	prio => 0,
3175	at => $NEXT_TICK || $TICK,
3176	data => WF_AUTOCANCEL,
3177	cb => sub {
3178	if ($Coro::current != $Coro::main) {	3597	if ($Coro::current != $Coro::main) {
3179	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3598	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3180	unless ++$bug_warning > 10;	3599	unless ++$bug_warning > 10;
3181	return;	3600	return;
3182	}	3601	}
3183		3602
3184	$NOW = $tick_start = Event::time;	3603	$NOW = $tick_start = EV::now;
3185		3604
3186	cf::server_tick; # one server iteration	3605	cf::server_tick; # one server iteration
3187		3606
3188	0 && sync_job {#d#	3607	$RUNTIME += $TICK;
3189	for(1..10) {	3608	$NEXT_TICK += $TICK;
3190	my $t = Event::time;
3191	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192	or die;
3193		3609
3194	$map->width (50);	3610	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3195	$map->height (50);	3611	$NEXT_RUNTIME_WRITE = $NOW + 10;
3196	$map->alloc;	3612	Coro::async_pool {
3197	$map->_load_objects ("/tmp/x.map", 1);	3613	$Coro::current->{desc} = "runtime saver";
3198	my $t = Event::time - $t;	3614	write_runtime
3199		3615	or warn "ERROR: unable to write runtime file: $!";
3200	#next unless $t < 0.0013;#d#
3201	if ($t < $min) {
3202	$min = $t;
3203	}
3204	$avg = $avg * 0.99 + $t * 0.01;
3205	}
3206	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207	exit 0;
3208	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209	};	3616	};
		3617	}
3210		3618
3211	$RUNTIME += $TICK;
3212	$NEXT_TICK += $TICK;
3213
3214	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215	$NEXT_RUNTIME_WRITE = $NOW + 10;
3216	Coro::async_pool {
3217	write_runtime
3218	or warn "ERROR: unable to write runtime file: $!";
3219	};
3220	}
3221
3222	# my $AFTER = Event::time;
3223	# warn $AFTER - $NOW;#d#
3224
3225	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3619	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226	$sig->send;	3620	$sig->send;
3227	}	3621	}
3228	while (my $sig = shift @WAIT_FOR_TICK) {	3622	while (my $sig = shift @WAIT_FOR_TICK) {
3229	$sig->send;	3623	$sig->send;
3230	}	3624	}
3231		3625
3232	$NOW = Event::time;
3233
3234	# if we are delayed by four ticks or more, skip them all
3235	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3236
3237	$TICK_WATCHER->at ($NEXT_TICK);
3238	$TICK_WATCHER->start;
3239
3240	$LOAD = ($NOW - $tick_start) / $TICK;	3626	$LOAD = ($NOW - $tick_start) / $TICK;
3241	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3627	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242		3628
3243	_post_tick;	3629	_post_tick;
3244		3630	};
3245		3631	$TICK_WATCHER->priority (EV::MAXPRI);
3246	},
3247	);
3248		3632
3249	{	3633	{
		3634	BDB::min_parallel 8;
3250	BDB::max_poll_time $TICK * 0.1;	3635	BDB::max_poll_time $TICK * 0.1;
3251	$BDB_POLL_WATCHER = Event->io (	3636	$BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3252	reentrant => 0,
3253	fd => BDB::poll_fileno,
3254	poll => 'r',
3255	prio => 0,
3256	data => WF_AUTOCANCEL,
3257	cb => \&BDB::poll_cb,
3258	);
3259	BDB::min_parallel 8;
3260		3637
3261	BDB::set_sync_prepare {	3638	BDB::set_sync_prepare {
3262	my $status;	3639	my $status;
3263	my $current = $Coro::current;	3640	my $current = $Coro::current;
3264	(	3641	(
…		…
3273	)	3650	)
3274	};	3651	};
3275		3652
3276	unless ($DB_ENV) {	3653	unless ($DB_ENV) {
3277	$DB_ENV = BDB::db_env_create;	3654	$DB_ENV = BDB::db_env_create;
		3655	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3656	| BDB::LOG_AUTOREMOVE, 1);
		3657	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3658	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278		3659
3279	cf::sync_job {	3660	cf::sync_job {
3280	eval {	3661	eval {
3281	BDB::db_env_open	3662	BDB::db_env_open
3282	$DB_ENV,	3663	$DB_ENV,
…		…
3284	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3665	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3285	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3666	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286	0666;	3667	0666;
3287		3668
3288	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3669	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291	$DB_ENV->set_lk_detect;
3292	};	3670	};
3293		3671
3294	cf::cleanup "db_env_open(db): $@" if $@;	3672	cf::cleanup "db_env_open(db): $@" if $@;
3295	};	3673	};
3296	}	3674	}
		3675
		3676	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3677	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3678	};
		3679	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3680	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3681	};
		3682	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3683	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3684	};
3297	}	3685	}
3298		3686
3299	{	3687	{
3300	IO::AIO::min_parallel 8;	3688	IO::AIO::min_parallel 8;
3301		3689
3302	undef $Coro::AIO::WATCHER;	3690	undef $Coro::AIO::WATCHER;
3303	IO::AIO::max_poll_time $TICK * 0.1;	3691	IO::AIO::max_poll_time $TICK * 0.1;
3304	$AIO_POLL_WATCHER = Event->io (	3692	$AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3305	reentrant => 0,
3306	data => WF_AUTOCANCEL,
3307	fd => IO::AIO::poll_fileno,
3308	poll => 'r',
3309	prio => 6,
3310	cb => \&IO::AIO::poll_cb,
3311	);
3312	}	3693	}
3313		3694
3314	my $_log_backtrace;	3695	my $_log_backtrace;
3315		3696
3316	sub _log_backtrace {	3697	sub _log_backtrace {
…		…
3320		3701
3321	# limit the # of concurrent backtraces	3702	# limit the # of concurrent backtraces
3322	if ($_log_backtrace < 2) {	3703	if ($_log_backtrace < 2) {
3323	++$_log_backtrace;	3704	++$_log_backtrace;
3324	async {	3705	async {
		3706	$Coro::current->{desc} = "abt $msg";
		3707
3325	my @bt = fork_call {	3708	my @bt = fork_call {
3326	@addr = map { sprintf "%x", $_ } @addr;	3709	@addr = map { sprintf "%x", $_ } @addr;
3327	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3710	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3711	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329	or die "addr2line: $!";	3712	or die "addr2line: $!";

Diff Legend

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