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.330 by elmex, Fri Aug 10 10:35:07 2007 UTC vs.
Revision 1.405 by root, Mon Dec 17 08:03:22 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 1.86;
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.32 ();
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::BDB;
23	use Coro::Storable;	24	use Coro::Storable;
		25	use Coro::Util ();
24		26
25	use JSON::XS 1.4 ();	27	use JSON::XS 2.01 ();
26	use BDB ();	28	use BDB ();
27	use Data::Dumper;	29	use Data::Dumper;
28	use Digest::MD5;	30	use Digest::MD5;
29	use Fcntl;	31	use Fcntl;
30	use YAML::Syck ();	32	use YAML::Syck ();
31	use IO::AIO 2.32 ();	33	use IO::AIO 2.51 ();
32	use Time::HiRes;	34	use Time::HiRes;
33	use Compress::LZF;	35	use Compress::LZF;
34	use Digest::MD5 ();	36	use Digest::MD5 ();
35		37
36	# configure various modules to our taste	38	# configure various modules to our taste
37	#	39	#
38	$Storable::canonical = 1; # reduce rsync transfers	40	$Storable::canonical = 1; # reduce rsync transfers
39	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	41	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	42	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		43
44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	44	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45	$YAML::Syck::ImplicitUnicode = 1;	45	$YAML::Syck::ImplicitUnicode = 1;
46		46
47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	47	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
…		…
69	our $TMPDIR = "$LOCALDIR/" . tmpdir;	69	our $TMPDIR = "$LOCALDIR/" . tmpdir;
70	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	70	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	71	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72	our $RANDOMDIR = "$LOCALDIR/random";	72	our $RANDOMDIR = "$LOCALDIR/random";
73	our $BDBDIR = "$LOCALDIR/db";	73	our $BDBDIR = "$LOCALDIR/db";
		74	our %RESOURCE;
74		75
75	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76	our $TICK_WATCHER;	77	our $TICK_WATCHER;
77	our $AIO_POLL_WATCHER;	78	our $AIO_POLL_WATCHER;
78	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79	our $NEXT_TICK;	80	our $NEXT_TICK;
80	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	81	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		82
83	our $BDB_POLL_WATCHER;	83	our $BDB_POLL_WATCHER;
		84	our $BDB_DEADLOCK_WATCHER;
		85	our $BDB_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	87	our $DB_ENV;
85		88
86	our %CFG;	89	our %CFG;
87		90
88	our $UPTIME; $UPTIME ||= time;	91	our $UPTIME; $UPTIME ||= time;
89	our $RUNTIME;	92	our $RUNTIME;
		93	our $NOW;
90		94
91	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
94		98
95	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		101
…		…
158		162
159	The raw value load value from the last tick.	163	The raw value load value from the last tick.
160		164
161	=item %cf::CFG	165	=item %cf::CFG
162		166
163	Configuration for the server, loaded from C</etc/crossfire/config>, or	167	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164	from wherever your confdir points to.	168	from wherever your confdir points to.
165		169
166	=item cf::wait_for_tick, cf::wait_for_tick_begin	170	=item cf::wait_for_tick, cf::wait_for_tick_begin
167		171
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
186	$msg .= "\n"	190	$msg .= "\n"
187	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
188		192
189	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190		194
191	utf8::encode $msg;
192	LOG llevError, $msg;	195	LOG llevError, $msg;
193	};	196	};
194	}	197	}
195		198
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
212	)) {	215	)) {
213	no strict 'refs';	216	no strict 'refs';
214	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	217	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215	}	218	}
216		219
217	$Event::DIED = sub {	220	$EV::DIED = sub {
218	warn "error in event callback: @_";	221	warn "error in event callback: @_";
219	};	222	};
220		223
221	#############################################################################	224	#############################################################################
222		225
…		…
245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246	$d	249	$d
247	} || "[unable to dump $_[0]: '$@']";	250	} || "[unable to dump $_[0]: '$@']";
248	}	251	}
249		252
250	=item $ref = cf::from_json $json	253	=item $ref = cf::decode_json $json
251		254
252	Converts a JSON string into the corresponding perl data structure.	255	Converts a JSON string into the corresponding perl data structure.
253		256
254	=item $json = cf::to_json $ref	257	=item $json = cf::encode_json $ref
255		258
256	Converts a perl data structure into its JSON representation.	259	Converts a perl data structure into its JSON representation.
257		260
258	=cut	261	=cut
259		262
260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261		264
262	sub to_json ($) { $json_coder->encode ($_[0]) }	265	sub encode_json($) { $json_coder->encode ($_[0]) }
263	sub from_json ($) { $json_coder->decode ($_[0]) }	266	sub decode_json($) { $json_coder->decode ($_[0]) }
264		267
265	=item cf::lock_wait $string	268	=item cf::lock_wait $string
266		269
267	Wait until the given lock is available. See cf::lock_acquire.	270	Wait until the given lock is available. See cf::lock_acquire.
268		271
…		…
271	Wait until the given lock is available and then acquires it and returns	274	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,	275	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	276	for example when the coroutine gets canceled), the lock is automatically
274	returned.	277	returned.
275		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
276	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
277	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
278		284
279	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
280		286
281	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
282		288
283	=cut	289	=cut
284		290
285	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
286		293
287	sub lock_wait($) {	294	sub lock_wait($) {
288	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
289		301
290	# wait for lock, if any	302	# wait for lock, if any
291	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;	305	Coro::schedule;
…		…
299		311
300	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
301	lock_wait $key;	313	lock_wait $key;
302		314
303	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
304		317
305	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
306	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
308	}	322	}
309	}	323	}
310		324
…		…
322	};	336	};
323	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
324	$guard	338	$guard
325	}	339	}
326		340
		341	=item cf::periodic $interval, $cb
		342
		343	Like EV::periodic, but randomly selects a starting point so that the actions
		344	get spread over timer.
		345
		346	=cut
		347
		348	sub periodic($$) {
		349	my ($interval, $cb) = @_;
		350
		351	my $start = rand List::Util::min 180, $interval;
		352
		353	EV::periodic $start, $interval, 0, $cb
		354	}
		355
327	=item cf::get_slot $time[, $priority[, $name]]	356	=item cf::get_slot $time[, $priority[, $name]]
328		357
329	Allocate $time seconds of blocking CPU time at priority C<$priority>:	358	Allocate $time seconds of blocking CPU time at priority C<$priority>:
330	This call blocks and returns only when you have at least C<$time> seconds	359	This call blocks and returns only when you have at least C<$time> seconds
331	of cpu time till the next tick. The slot is only valid till the next cede.	360	of cpu time till the next tick. The slot is only valid till the next cede.
…		…
340	our @SLOT_QUEUE;	369	our @SLOT_QUEUE;
341	our $SLOT_QUEUE;	370	our $SLOT_QUEUE;
342		371
343	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	372	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344	$SLOT_QUEUE = Coro::async {	373	$SLOT_QUEUE = Coro::async {
		374	$Coro::current->desc ("timeslot manager");
		375
345	my $signal = new Coro::Signal;	376	my $signal = new Coro::Signal;
346		377
347	while () {	378	while () {
348	next_job:	379	next_job:
349	my $avail = cf::till_tick;	380	my $avail = cf::till_tick;
…		…
357	}	388	}
358	}	389	}
359	}	390	}
360		391
361	if (@SLOT_QUEUE) {	392	if (@SLOT_QUEUE) {
362	# we do not use wait_For_tick() as it returns immediately when tick is inactive	393	# we do not use wait_for_tick() as it returns immediately when tick is inactive
363	push @cf::WAIT_FOR_TICK, $signal;	394	push @cf::WAIT_FOR_TICK, $signal;
364	$signal->wait;	395	$signal->wait;
365	} else {	396	} else {
366	Coro::schedule;	397	Coro::schedule;
367	}	398	}
…		…
390		421
391	BEGIN { *async = \&Coro::async_pool }	422	BEGIN { *async = \&Coro::async_pool }
392		423
393	=item cf::sync_job { BLOCK }	424	=item cf::sync_job { BLOCK }
394		425
395	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	426	The design of Deliantra requires that the main coroutine ($Coro::main)
396	is always able to handle events or runnable, as Crossfire TRT is only	427	is always able to handle events or runnable, as Deliantra is only
397	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	428	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398	acceptable.	429	acceptable.
399		430
400	If it must be done, put the blocking parts into C<sync_job>. This will run	431	If it must be done, put the blocking parts into C<sync_job>. This will run
401	the given BLOCK in another coroutine while waiting for the result. The	432	the given BLOCK in another coroutine while waiting for the result. The
…		…
406		437
407	sub sync_job(&) {	438	sub sync_job(&) {
408	my ($job) = @_;	439	my ($job) = @_;
409		440
410	if ($Coro::current == $Coro::main) {	441	if ($Coro::current == $Coro::main) {
411	my $time = Event::time;	442	my $time = EV::time;
412		443
413	# this is the main coro, too bad, we have to block	444	# this is the main coro, too bad, we have to block
414	# till the operation succeeds, freezing the server :/	445	# till the operation succeeds, freezing the server :/
415		446
		447	LOG llevError, Carp::longmess "sync job";#d#
		448
416	# TODO: use suspend/resume instead	449	# TODO: use suspend/resume instead
417	# (but this is cancel-safe)	450	# (but this is cancel-safe)
418	my $freeze_guard = freeze_mainloop;	451	my $freeze_guard = freeze_mainloop;
419		452
420	my $busy = 1;	453	my $busy = 1;
421	my @res;	454	my @res;
422		455
423	(async {	456	(async {
		457	$Coro::current->desc ("sync job coro");
424	@res = eval { $job->() };	458	@res = eval { $job->() };
425	warn $@ if $@;	459	warn $@ if $@;
426	undef $busy;	460	undef $busy;
427	})->prio (Coro::PRIO_MAX);	461	})->prio (Coro::PRIO_MAX);
428		462
429	while ($busy) {	463	while ($busy) {
430	Coro::cede or Event::one_event;	464	if (Coro::nready) {
		465	Coro::cede_notself;
		466	} else {
		467	EV::loop EV::LOOP_ONESHOT;
431	}	468	}
		469	}
432		470
433	$time = Event::time - $time;	471	$time = EV::time - $time;
434		472
435	LOG llevError | logBacktrace, Carp::longmess "long sync job"	473	LOG llevError | logBacktrace, Carp::longmess "long sync job"
436	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	474	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437		475
438	$tick_start += $time; # do not account sync jobs to server load	476	$tick_start += $time; # do not account sync jobs to server load
…		…
468	=item fork_call { }, $args	506	=item fork_call { }, $args
469		507
470	Executes the given code block with the given arguments in a seperate	508	Executes the given code block with the given arguments in a seperate
471	process, returning the results. Everything must be serialisable with	509	process, returning the results. Everything must be serialisable with
472	Coro::Storable. May, of course, block. Note that the executed sub may	510	Coro::Storable. May, of course, block. Note that the executed sub may
473	never block itself or use any form of Event handling.	511	never block itself or use any form of event handling.
474		512
475	=cut	513	=cut
476
477	sub _store_scalar {
478	open my $fh, ">", \my $buf
479	or die "fork_call: cannot open fh-to-buf in child : $!";
480	Storable::store_fd $_[0], $fh;
481	close $fh;
482
483	$buf
484	}
485		514
486	sub fork_call(&@) {	515	sub fork_call(&@) {
487	my ($cb, @args) = @_;	516	my ($cb, @args) = @_;
488		517
489	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	518	# we seemingly have to make a local copy of the whole thing,
490	# or die "socketpair: $!";	519	# otherwise perl prematurely frees the stuff :/
491	pipe my $fh1, my $fh2	520	# TODO: investigate and fix (likely this will be rather laborious)
492	or die "pipe: $!";
493		521
494	if (my $pid = fork) {	522	my @res = Coro::Util::fork_eval {
495	close $fh2;
496
497	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498	warn "pst<$res>" unless $res =~ /^pst/;
499	$res = Coro::Storable::thaw $res;
500
501	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503	Carp::confess $$res unless "ARRAY" eq ref $res;
504
505	return wantarray ? @$res : $res->[-1];
506	} else {
507	reset_signals;	523	reset_signals;
508	local $SIG{__WARN__};	524	&$cb
509	local $SIG{__DIE__};	525	}, @args;
510	# just in case, this hack effectively disables event
511	# in the child. cleaner and slower would be canceling all watchers,
512	# but this works for the time being.
513	local $Coro::idle;
514	$Coro::current->prio (Coro::PRIO_MAX);
515		526
516	eval {	527	wantarray ? @res : $res[-1]
517	close $fh1;
518
519	my @res = eval { $cb->(@args) };
520
521	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522	close $fh2;
523	};
524
525	warn $@ if $@;
526	_exit 0;
527	}
528	}	528	}
529		529
530	=item $value = cf::db_get $family => $key	530	=item $value = cf::db_get $family => $key
531		531
532	Returns a single value from the environment database.	532	Returns a single value from the environment database.
…		…
534	=item cf::db_put $family => $key => $value	534	=item cf::db_put $family => $key => $value
535		535
536	Stores the given C<$value> in the family. It can currently store binary	536	Stores the given C<$value> in the family. It can currently store binary
537	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	537	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538		538
		539	=item $db = cf::db_table "name"
		540
		541	Create and/or open a new database table. The string must not be "db" and must be unique
		542	within each server.
		543
539	=cut	544	=cut
		545
		546	sub db_table($) {
		547	my ($name) = @_;
		548	my $db = BDB::db_create $DB_ENV;
		549
		550	eval {
		551	$db->set_flags (BDB::CHKSUM);
		552
		553	utf8::encode $name;
		554	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		555	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		556	cf::cleanup "db_open(db): $!" if $!;
		557	};
		558	cf::cleanup "db_open(db): $@" if $@;
		559
		560	$db
		561	}
540		562
541	our $DB;	563	our $DB;
542		564
543	sub db_init {	565	sub db_init {
544	unless ($DB) {
545	$DB = BDB::db_create $DB_ENV;
546
547	cf::sync_job {	566	cf::sync_job {
548	eval {	567	$DB ||= db_table "db";
549	$DB->set_flags (BDB::CHKSUM);
550
551	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553	cf::cleanup "db_open(db): $!" if $!;
554	};
555	cf::cleanup "db_open(db): $@" if $@;
556	};
557	}	568	};
558	}	569	}
559		570
560	sub db_get($$) {	571	sub db_get($$) {
561	my $key = "$_[0]/$_[1]";	572	my $key = "$_[0]/$_[1]";
562		573
…		…
612	if (1) {	623	if (1) {
613	$md5 =	624	$md5 =
614	join "\x00",	625	join "\x00",
615	$processversion,	626	$processversion,
616	map {	627	map {
617	Coro::cede;	628	cf::cede_to_tick;
618	($src->[$_], Digest::MD5::md5_hex $data[$_])	629	($src->[$_], Digest::MD5::md5_hex $data[$_])
619	} 0.. $#$src;	630	} 0.. $#$src;
620		631
621		632
622	my $dbmd5 = db_get cache => "$id/md5";	633	my $dbmd5 = db_get cache => "$id/md5";
…		…
666	attach callbacks/event handlers (a collection of which is called an "attachment")	677	attach callbacks/event handlers (a collection of which is called an "attachment")
667	to it. All such attachable objects support the following methods.	678	to it. All such attachable objects support the following methods.
668		679
669	In the following description, CLASS can be any of C<global>, C<object>	680	In the following description, CLASS can be any of C<global>, C<object>
670	C<player>, C<client> or C<map> (i.e. the attachable objects in	681	C<player>, C<client> or C<map> (i.e. the attachable objects in
671	Crossfire TRT).	682	Deliantra).
672		683
673	=over 4	684	=over 4
674		685
675	=item $attachable->attach ($attachment, key => $value...)	686	=item $attachable->attach ($attachment, key => $value...)
676		687
…		…
974		985
975	=cut	986	=cut
976		987
977	#############################################################################	988	#############################################################################
978	# object support	989	# object support
979	#
980		990
		991	sub _object_equal($$);
		992	sub _object_equal($$) {
		993	my ($a, $b) = @_;
		994
		995	return 0 unless (ref $a) eq (ref $b);
		996
		997	if ("HASH" eq ref $a) {
		998	my @ka = keys %$a;
		999	my @kb = keys %$b;
		1000
		1001	return 0 if @ka != @kb;
		1002
		1003	for (0 .. $#ka) {
		1004	return 0 unless $ka[$_] eq $kb[$_];
		1005	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1006	}
		1007
		1008	} elsif ("ARRAY" eq ref $a) {
		1009
		1010	return 0 if @$a != @$b;
		1011
		1012	for (0 .. $#$a) {
		1013	return 0 unless _object_equal $a->[$_], $b->[$_];
		1014	}
		1015
		1016	} elsif ($a ne $b) {
		1017	return 0;
		1018	}
		1019
		1020	1
		1021	}
		1022
		1023	our $SLOW_MERGES;#d#
981	sub _can_merge {	1024	sub _can_merge {
982	my ($ob1, $ob2) = @_;	1025	my ($ob1, $ob2) = @_;
983		1026
984	local $Storable::canonical = 1;	1027	++$SLOW_MERGES;#d#
985	my $fob1 = Storable::freeze $ob1;
986	my $fob2 = Storable::freeze $ob2;
987		1028
988	$fob1 eq $fob2	1029	# we do the slow way here
		1030	return _object_equal $ob1, $ob2
989	}	1031	}
990		1032
991	sub reattach {	1033	sub reattach {
992	# basically do the same as instantiate, without calling instantiate	1034	# basically do the same as instantiate, without calling instantiate
993	my ($obj) = @_;	1035	my ($obj) = @_;
…		…
1015	cf::attachable->attach (	1057	cf::attachable->attach (
1016	prio => -1000000,	1058	prio => -1000000,
1017	on_instantiate => sub {	1059	on_instantiate => sub {
1018	my ($obj, $data) = @_;	1060	my ($obj, $data) = @_;
1019		1061
1020	$data = from_json $data;	1062	$data = decode_json $data;
1021		1063
1022	for (@$data) {	1064	for (@$data) {
1023	my ($name, $args) = @$_;	1065	my ($name, $args) = @$_;
1024		1066
1025	$obj->attach ($name, %{$args || {} });	1067	$obj->attach ($name, %{$args || {} });
…		…
1041	sub object_freezer_save {	1083	sub object_freezer_save {
1042	my ($filename, $rdata, $objs) = @_;	1084	my ($filename, $rdata, $objs) = @_;
1043		1085
1044	sync_job {	1086	sync_job {
1045	if (length $$rdata) {	1087	if (length $$rdata) {
		1088	utf8::decode (my $decname = $filename);
1046	warn sprintf "saving %s (%d,%d)\n",	1089	warn sprintf "saving %s (%d,%d)\n",
1047	$filename, length $$rdata, scalar @$objs;	1090	$decname, length $$rdata, scalar @$objs;
1048		1091
1049	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1092	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050	chmod SAVE_MODE, $fh;	1093	chmod SAVE_MODE, $fh;
1051	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1094	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052	aio_fsync $fh if $cf::USE_FSYNC;	1095	aio_fsync $fh if $cf::USE_FSYNC;
1053	close $fh;	1096	close $fh;
1054		1097
1055	if (@$objs) {	1098	if (@$objs) {
1056	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1099	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057	chmod SAVE_MODE, $fh;	1100	chmod SAVE_MODE, $fh;
1058	my $data = Storable::nfreeze { version => 1, objs => $objs };	1101	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059	aio_write $fh, 0, (length $data), $data, 0;	1102	aio_write $fh, 0, (length $data), $data, 0;
1060	aio_fsync $fh if $cf::USE_FSYNC;	1103	aio_fsync $fh if $cf::USE_FSYNC;
1061	close $fh;	1104	close $fh;
1062	aio_rename "$filename.pst~", "$filename.pst";	1105	aio_rename "$filename.pst~", "$filename.pst";
1063	}	1106	}
…		…
1071	}	1114	}
1072	} else {	1115	} else {
1073	aio_unlink $filename;	1116	aio_unlink $filename;
1074	aio_unlink "$filename.pst";	1117	aio_unlink "$filename.pst";
1075	}	1118	}
1076	}	1119	};
1077	}	1120	}
1078		1121
1079	sub object_freezer_as_string {	1122	sub object_freezer_as_string {
1080	my ($rdata, $objs) = @_;	1123	my ($rdata, $objs) = @_;
1081		1124
…		…
1093	or return;	1136	or return;
1094		1137
1095	unless (aio_stat "$filename.pst") {	1138	unless (aio_stat "$filename.pst") {
1096	(aio_load "$filename.pst", $av) >= 0	1139	(aio_load "$filename.pst", $av) >= 0
1097	or return;	1140	or return;
		1141
1098	$av = eval { (Storable::thaw $av)->{objs} };	1142	my $st = eval { Coro::Storable::thaw $av };
		1143	$av = $st->{objs};
1099	}	1144	}
1100		1145
		1146	utf8::decode (my $decname = $filename);
1101	warn sprintf "loading %s (%d)\n",	1147	warn sprintf "loading %s (%d,%d)\n",
1102	$filename, length $data, scalar @{$av || []};	1148	$decname, length $data, scalar @{$av || []};
		1149
1103	return ($data, $av);	1150	($data, $av)
1104	}	1151	}
1105		1152
1106	=head2 COMMAND CALLBACKS	1153	=head2 COMMAND CALLBACKS
1107		1154
1108	=over 4	1155	=over 4
…		…
1186	my ($type, $reply, @payload) =	1233	my ($type, $reply, @payload) =
1187	"ARRAY" eq ref $msg	1234	"ARRAY" eq ref $msg
1188	? @$msg	1235	? @$msg
1189	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	1236	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190		1237
		1238	my @reply;
		1239
1191	if (my $cb = $EXTCMD{$type}) {	1240	if (my $cb = $EXTCMD{$type}) {
1192	my @reply = $cb->($pl, @payload);	1241	@reply = $cb->($pl, @payload);
1193
1194	$pl->ext_reply ($reply, @reply)
1195	if $reply;
1196	}	1242	}
		1243
		1244	$pl->ext_reply ($reply, @reply)
		1245	if $reply;
		1246
1197	} else {	1247	} else {
1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1248	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199	}	1249	}
1200		1250
1201	cf::override;	1251	cf::override;
…		…
1291		1341
1292	=head3 cf::player	1342	=head3 cf::player
1293		1343
1294	=over 4	1344	=over 4
1295		1345
		1346	=item cf::player::num_playing
		1347
		1348	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1349
		1350	=cut
		1351
		1352	sub num_playing {
		1353	scalar grep
		1354	$_->ob->map
		1355	&& !$_->hidden
		1356	&& !$_->ob->flag (cf::FLAG_WIZ),
		1357	cf::player::list
		1358	}
		1359
1296	=item cf::player::find $login	1360	=item cf::player::find $login
1297		1361
1298	Returns the given player object, loading it if necessary (might block).	1362	Returns the given player object, loading it if necessary (might block).
1299		1363
1300	=cut	1364	=cut
…		…
1335	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1399	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1400	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1401	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338	aio_unlink +(playerdir $login) . "/$login.pl";	1402	aio_unlink +(playerdir $login) . "/$login.pl";
1339		1403
1340	my $pl = load_pl path $login	1404	my $f = new_from_file cf::object::thawer path $login
1341	or return;	1405	or return;
		1406
		1407	my $pl = cf::player::load_pl $f
		1408	or return;
		1409	local $cf::PLAYER_LOADING{$login} = $pl;
		1410	$f->resolve_delayed_derefs;
1342	$cf::PLAYER{$login} = $pl	1411	$cf::PLAYER{$login} = $pl
1343	}	1412	}
1344	}	1413	}
1345	}	1414	}
1346		1415
…		…
1356		1425
1357	aio_mkdir playerdir $pl, 0770;	1426	aio_mkdir playerdir $pl, 0770;
1358	$pl->{last_save} = $cf::RUNTIME;	1427	$pl->{last_save} = $cf::RUNTIME;
1359		1428
1360	$pl->save_pl ($path);	1429	$pl->save_pl ($path);
1361	Coro::cede;	1430	cf::cede_to_tick;
1362	}	1431	}
1363		1432
1364	sub new($) {	1433	sub new($) {
1365	my ($login) = @_;	1434	my ($login) = @_;
1366		1435
…		…
1444	or return [];	1513	or return [];
1445		1514
1446	my @logins;	1515	my @logins;
1447		1516
1448	for my $login (@$dirs) {	1517	for my $login (@$dirs) {
		1518	my $path = path $login;
		1519
		1520	# a .pst is a dead give-away for a valid player
		1521	unless (-e "$path.pst") {
1449	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1522	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450	aio_read $fh, 0, 512, my $buf, 0 or next;	1523	aio_read $fh, 0, 512, my $buf, 0 or next;
1451	$buf !~ /^password -------------$/m or next; # official not-valid tag	1524	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1525	}
1452		1526
1453	utf8::decode $login;	1527	utf8::decode $login;
1454	push @logins, $login;	1528	push @logins, $login;
1455	}	1529	}
1456		1530
…		…
1489		1563
1490	Expand crossfire pod fragments into protocol xml.	1564	Expand crossfire pod fragments into protocol xml.
1491		1565
1492	=cut	1566	=cut
1493		1567
		1568	use re 'eval';
		1569
		1570	my $group;
		1571	my $interior; $interior = qr{
		1572	# match a pod interior sequence sans C<< >>
		1573	(?:
		1574	\ (.*?)\ (?{ $group = $^N })
		1575	| < (??{$interior}) >
		1576	)
		1577	}x;
		1578
1494	sub expand_cfpod {	1579	sub expand_cfpod {
1495	((my $self), (local $_)) = @_;	1580	my ($self, $pod) = @_;
1496		1581
1497	# escape & and <	1582	my $xml;
1498	s/&/&amp;/g;
1499	s/(?<![BIUGH])</&lt;/g;
1500		1583
1501	# this is buggy, it needs to properly take care of nested <'s	1584	while () {
		1585	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1586	$group = $1;
1502		1587
1503	1 while	1588	$group =~ s/&/&amp;/g;
1504	# replace B<>, I<>, U<> etc.	1589	$group =~ s/</&lt;/g;
1505	s/B<([^\>]*)>/<b>$1<\/b>/	1590
1506	|| s/I<([^\>]*)>/<i>$1<\/i>/	1591	$xml .= $group;
1507	|| s/U<([^\>]*)>/<u>$1<\/u>/	1592	} elsif ($pod =~ m%\G
1508	# replace G<male|female> tags	1593	([BCGHITU])
1509	|| s{G<([^>|]*)\|([^>]*)>}{	1594	<
1510	$self->gender ? $2 : $1	1595	(?:
1511	}ge	1596	([^<>]*) (?{ $group = $^N })
1512	# replace H<hint text>	1597	| < $interior >
1513	|| s{H<([^\>]*)>}	1598	)
		1599	>
		1600	%gcsx
1514	{	1601	) {
		1602	my ($code, $data) = ($1, $group);
		1603
		1604	if ($code eq "B") {
		1605	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1606	} elsif ($code eq "I") {
		1607	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1608	} elsif ($code eq "U") {
		1609	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1610	} elsif ($code eq "C") {
		1611	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1612	} elsif ($code eq "T") {
		1613	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1614	} elsif ($code eq "G") {
		1615	my ($male, $female) = split /\|/, $data;
		1616	$data = $self->gender ? $female : $male;
		1617	$xml .= expand_cfpod ($self, $data);
		1618	} elsif ($code eq "H") {
1515	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1619	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1516	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1620	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517	"")	1621	"")
1518	[$self->{hintmode}]	1622	[$self->{hintmode}];
		1623	} else {
		1624	$xml .= "error processing '$code($data)' directive";
1519	}ge;	1625	}
		1626	} else {
		1627	if ($pod =~ /\G(.+)/) {
		1628	warn "parse error while expanding $pod (at $1)";
		1629	}
		1630	last;
		1631	}
		1632	}
1520		1633
		1634	for ($xml) {
1521	# create single paragraphs (very hackish)	1635	# create single paragraphs (very hackish)
1522	s/(?<=\S)\n(?=\w)/ /g;	1636	s/(?<=\S)\n(?=\w)/ /g;
1523		1637
1524	# compress some whitespace	1638	# compress some whitespace
1525	s/\s+\n/\n/g; # ws line-ends	1639	s/\s+\n/\n/g; # ws line-ends
1526	s/\n\n+/\n/g; # double lines	1640	s/\n\n+/\n/g; # double lines
1527	s/^\n+//; # beginning lines	1641	s/^\n+//; # beginning lines
1528	s/\n+$//; # ending lines	1642	s/\n+$//; # ending lines
		1643	}
1529		1644
1530	$_	1645	$xml
1531	}	1646	}
		1647
		1648	no re 'eval';
1532		1649
1533	sub hintmode {	1650	sub hintmode {
1534	$_[0]{hintmode} = $_[1] if @_ > 1;	1651	$_[0]{hintmode} = $_[1] if @_ > 1;
1535	$_[0]{hintmode}	1652	$_[0]{hintmode}
1536	}	1653	}
…		…
1542	=cut	1659	=cut
1543		1660
1544	sub ext_reply($$@) {	1661	sub ext_reply($$@) {
1545	my ($self, $id, @msg) = @_;	1662	my ($self, $id, @msg) = @_;
1546		1663
1547	if ($self->ns->extcmd == 2) {	1664	$self->ns->ext_reply ($id, @msg)
1548	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549	} elsif ($self->ns->extcmd == 1) {
1550	#TODO: version 1, remove
1551	unshift @msg, msgtype => "reply", msgid => $id;
1552	$self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553	}
1554	}	1665	}
1555		1666
1556	=item $player->ext_msg ($type, @msg)	1667	=item $player->ext_msg ($type, @msg)
1557		1668
1558	Sends an ext event to the client.	1669	Sends an ext event to the client.
…		…
1786		1897
1787	sub load_header_from($) {	1898	sub load_header_from($) {
1788	my ($self, $path) = @_;	1899	my ($self, $path) = @_;
1789		1900
1790	utf8::encode $path;	1901	utf8::encode $path;
1791	#aio_open $path, O_RDONLY, 0	1902	my $f = new_from_file cf::object::thawer $path
1792	# or return;
1793
1794	$self->_load_header ($path)
1795	or return;	1903	or return;
		1904
		1905	$self->_load_header ($f)
		1906	or return;
		1907
		1908	local $MAP_LOADING{$self->{path}} = $self;
		1909	$f->resolve_delayed_derefs;
1796		1910
1797	$self->{load_path} = $path;	1911	$self->{load_path} = $path;
1798		1912
1799	1	1913	1
1800	}	1914	}
…		…
1854	sub find {	1968	sub find {
1855	my ($path, $origin) = @_;	1969	my ($path, $origin) = @_;
1856		1970
1857	$path = normalise $path, $origin && $origin->path;	1971	$path = normalise $path, $origin && $origin->path;
1858		1972
		1973	cf::lock_wait "map_data:$path";#d#remove
1859	cf::lock_wait "map_find:$path";	1974	cf::lock_wait "map_find:$path";
1860		1975
1861	$cf::MAP{$path} || do {	1976	$cf::MAP{$path} || do {
1862	my $guard = cf::lock_acquire "map_find:$path";	1977	my $guard1 = cf::lock_acquire "map_find:$path";
		1978	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1979
1863	my $map = new_from_path cf::map $path	1980	my $map = new_from_path cf::map $path
1864	or return;	1981	or return;
1865		1982
1866	$map->{last_save} = $cf::RUNTIME;	1983	$map->{last_save} = $cf::RUNTIME;
1867		1984
…		…
1869	or return;	1986	or return;
1870		1987
1871	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1988	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872	# doing this can freeze the server in a sync job, obviously	1989	# doing this can freeze the server in a sync job, obviously
1873	#$cf::WAIT_FOR_TICK->wait;	1990	#$cf::WAIT_FOR_TICK->wait;
		1991	undef $guard1;
		1992	undef $guard2;
1874	$map->reset;	1993	$map->reset;
1875	undef $guard;
1876	return find $path;	1994	return find $path;
1877	}	1995	}
1878		1996
1879	$cf::MAP{$path} = $map	1997	$cf::MAP{$path} = $map
1880	}	1998	}
…		…
1889	local $self->{deny_reset} = 1; # loading can take a long time	2007	local $self->{deny_reset} = 1; # loading can take a long time
1890		2008
1891	my $path = $self->{path};	2009	my $path = $self->{path};
1892		2010
1893	{	2011	{
1894	my $guard = cf::lock_acquire "map_load:$path";	2012	my $guard = cf::lock_acquire "map_data:$path";
1895		2013
		2014	return unless $self->valid;
1896	return if $self->in_memory != cf::MAP_SWAPPED;	2015	return unless $self->in_memory == cf::MAP_SWAPPED;
1897		2016
1898	$self->in_memory (cf::MAP_LOADING);	2017	$self->in_memory (cf::MAP_LOADING);
1899		2018
1900	$self->alloc;	2019	$self->alloc;
1901		2020
1902	$self->pre_load;	2021	$self->pre_load;
1903	Coro::cede;	2022	cf::cede_to_tick;
1904		2023
		2024	my $f = new_from_file cf::object::thawer $self->{load_path};
		2025	$f->skip_block;
1905	$self->_load_objects ($self->{load_path}, 1)	2026	$self->_load_objects ($f)
1906	or return;	2027	or return;
1907		2028
1908	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2029	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909	if delete $self->{load_original};	2030	if delete $self->{load_original};
1910		2031
1911	if (my $uniq = $self->uniq_path) {	2032	if (my $uniq = $self->uniq_path) {
1912	utf8::encode $uniq;	2033	utf8::encode $uniq;
1913	if (aio_open $uniq, O_RDONLY, 0) {	2034	unless (aio_stat $uniq) {
		2035	if (my $f = new_from_file cf::object::thawer $uniq) {
1914	$self->clear_unique_items;	2036	$self->clear_unique_items;
1915	$self->_load_objects ($uniq, 0);	2037	$self->_load_objects ($f);
		2038	$f->resolve_delayed_derefs;
		2039	}
1916	}	2040	}
1917	}	2041	}
1918		2042
1919	Coro::cede;	2043	$f->resolve_delayed_derefs;
		2044
		2045	cf::cede_to_tick;
1920	# now do the right thing for maps	2046	# now do the right thing for maps
1921	$self->link_multipart_objects;	2047	$self->link_multipart_objects;
1922	$self->difficulty ($self->estimate_difficulty)	2048	$self->difficulty ($self->estimate_difficulty)
1923	unless $self->difficulty;	2049	unless $self->difficulty;
1924	Coro::cede;	2050	cf::cede_to_tick;
1925		2051
1926	unless ($self->{deny_activate}) {	2052	unless ($self->{deny_activate}) {
1927	$self->decay_objects;	2053	$self->decay_objects;
1928	$self->fix_auto_apply;	2054	$self->fix_auto_apply;
1929	$self->update_buttons;	2055	$self->update_buttons;
1930	Coro::cede;	2056	cf::cede_to_tick;
1931	$self->set_darkness_map;	2057	$self->set_darkness_map;
1932	Coro::cede;	2058	cf::cede_to_tick;
1933	$self->activate;	2059	$self->activate;
1934	}	2060	}
1935		2061
1936	$self->{last_save} = $cf::RUNTIME;	2062	$self->{last_save} = $cf::RUNTIME;
1937	$self->last_access ($cf::RUNTIME);	2063	$self->last_access ($cf::RUNTIME);
…		…
1953		2079
1954	$self	2080	$self
1955	}	2081	}
1956		2082
1957	# find and load all maps in the 3x3 area around a map	2083	# find and load all maps in the 3x3 area around a map
1958	sub load_diag {	2084	sub load_neighbours {
1959	my ($map) = @_;	2085	my ($map) = @_;
1960		2086
1961	my @diag; # diagonal neighbours	2087	my @neigh; # diagonal neighbours
1962		2088
1963	for (0 .. 3) {	2089	for (0 .. 3) {
1964	my $neigh = $map->tile_path ($_)	2090	my $neigh = $map->tile_path ($_)
1965	or next;	2091	or next;
1966	$neigh = find $neigh, $map	2092	$neigh = find $neigh, $map
1967	or next;	2093	or next;
1968	$neigh->load;	2094	$neigh->load;
1969		2095
		2096	push @neigh,
1970	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2097	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1971	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2098	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1972	}	2099	}
1973		2100
1974	for (@diag) {	2101	for (grep defined $_->[0], @neigh) {
		2102	my ($path, $origin) = @$_;
1975	my $neigh = find @$_	2103	my $neigh = find $path, $origin
1976	or next;	2104	or next;
1977	$neigh->load;	2105	$neigh->load;
1978	}	2106	}
1979	}	2107	}
1980		2108
…		…
1985	}	2113	}
1986		2114
1987	sub do_load_sync {	2115	sub do_load_sync {
1988	my ($map) = @_;	2116	my ($map) = @_;
1989		2117
		2118	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2119	if $Coro::current == $Coro::main;
		2120
1990	cf::sync_job { $map->load };	2121	cf::sync_job { $map->load };
1991	}	2122	}
1992		2123
1993	our %MAP_PREFETCH;	2124	our %MAP_PREFETCH;
1994	our $MAP_PREFETCHER = undef;	2125	our $MAP_PREFETCHER = undef;
1995		2126
1996	sub find_async {	2127	sub find_async {
1997	my ($path, $origin) = @_;	2128	my ($path, $origin, $load) = @_;
1998		2129
1999	$path = normalise $path, $origin && $origin->{path};	2130	$path = normalise $path, $origin && $origin->{path};
2000		2131
2001	if (my $map = $cf::MAP{$path}) {	2132	if (my $map = $cf::MAP{$path}) {
2002	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2133	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003	}	2134	}
2004		2135
2005	undef $MAP_PREFETCH{$path};	2136	$MAP_PREFETCH{$path} |= $load;
		2137
2006	$MAP_PREFETCHER ||= cf::async {	2138	$MAP_PREFETCHER ||= cf::async {
		2139	$Coro::current->{desc} = "map prefetcher";
		2140
2007	while (%MAP_PREFETCH) {	2141	while (%MAP_PREFETCH) {
2008	for my $path (keys %MAP_PREFETCH) {	2142	while (my ($k, $v) = each %MAP_PREFETCH) {
2009	if (my $map = find $path) {	2143	if (my $map = find $k) {
2010	$map->load;	2144	$map->load if $v;
2011	}	2145	}
2012		2146
2013	delete $MAP_PREFETCH{$path};	2147	delete $MAP_PREFETCH{$k};
2014	}	2148	}
2015	}	2149	}
2016	undef $MAP_PREFETCHER;	2150	undef $MAP_PREFETCHER;
2017	};	2151	};
2018	$MAP_PREFETCHER->prio (6);	2152	$MAP_PREFETCHER->prio (6);
…		…
2021	}	2155	}
2022		2156
2023	sub save {	2157	sub save {
2024	my ($self) = @_;	2158	my ($self) = @_;
2025		2159
2026	my $lock = cf::lock_acquire "map_data:" . $self->path;	2160	my $lock = cf::lock_acquire "map_data:$self->{path}";
2027		2161
2028	$self->{last_save} = $cf::RUNTIME;	2162	$self->{last_save} = $cf::RUNTIME;
2029		2163
2030	return unless $self->dirty;	2164	return unless $self->dirty;
2031		2165
…		…
2037	return if $self->{deny_save};	2171	return if $self->{deny_save};
2038		2172
2039	local $self->{last_access} = $self->last_access;#d#	2173	local $self->{last_access} = $self->last_access;#d#
2040		2174
2041	cf::async {	2175	cf::async {
		2176	$Coro::current->{desc} = "map player save";
2042	$_->contr->save for $self->players;	2177	$_->contr->save for $self->players;
2043	};	2178	};
2044		2179
2045	if ($uniq) {	2180	if ($uniq) {
2046	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2181	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
2054	my ($self) = @_;	2189	my ($self) = @_;
2055		2190
2056	# save first because save cedes	2191	# save first because save cedes
2057	$self->save;	2192	$self->save;
2058		2193
2059	my $lock = cf::lock_acquire "map_data:" . $self->path;	2194	my $lock = cf::lock_acquire "map_data:$self->{path}";
2060		2195
2061	return if $self->players;	2196	return if $self->players;
2062	return if $self->in_memory != cf::MAP_IN_MEMORY;	2197	return if $self->in_memory != cf::MAP_IN_MEMORY;
2063	return if $self->{deny_save};	2198	return if $self->{deny_save};
2064		2199
		2200	$self->in_memory (cf::MAP_SWAPPED);
		2201
		2202	$self->deactivate;
		2203	$_->clear_links_to ($self) for values %cf::MAP;
2065	$self->clear;	2204	$self->clear;
2066	$self->in_memory (cf::MAP_SWAPPED);
2067	}	2205	}
2068		2206
2069	sub reset_at {	2207	sub reset_at {
2070	my ($self) = @_;	2208	my ($self) = @_;
2071		2209
…		…
2103	if $uniq;	2241	if $uniq;
2104	}	2242	}
2105		2243
2106	delete $cf::MAP{$self->path};	2244	delete $cf::MAP{$self->path};
2107		2245
		2246	$self->deactivate;
		2247	$_->clear_links_to ($self) for values %cf::MAP;
2108	$self->clear;	2248	$self->clear;
2109
2110	$_->clear_links_to ($self) for values %cf::MAP;
2111		2249
2112	$self->unlink_save;	2250	$self->unlink_save;
2113	$self->destroy;	2251	$self->destroy;
2114	}	2252	}
2115		2253
2116	my $nuke_counter = "aaaa";	2254	my $nuke_counter = "aaaa";
2117		2255
2118	sub nuke {	2256	sub nuke {
2119	my ($self) = @_;	2257	my ($self) = @_;
2120		2258
		2259	{
		2260	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2261
2121	delete $cf::MAP{$self->path};	2262	delete $cf::MAP{$self->path};
2122		2263
2123	$self->unlink_save;	2264	$self->unlink_save;
2124		2265
2125	bless $self, "cf::map";	2266	bless $self, "cf::map";
2126	delete $self->{deny_reset};	2267	delete $self->{deny_reset};
2127	$self->{deny_save} = 1;	2268	$self->{deny_save} = 1;
2128	$self->reset_timeout (1);	2269	$self->reset_timeout (1);
2129	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2270	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130		2271
2131	$cf::MAP{$self->path} = $self;	2272	$cf::MAP{$self->path} = $self;
		2273	}
2132		2274
2133	$self->reset; # polite request, might not happen	2275	$self->reset; # polite request, might not happen
2134	}	2276	}
2135		2277
2136	=item $maps = cf::map::tmp_maps	2278	=item $maps = cf::map::tmp_maps
…		…
2212		2354
2213	sub inv_recursive {	2355	sub inv_recursive {
2214	inv_recursive_ inv $_[0]	2356	inv_recursive_ inv $_[0]
2215	}	2357	}
2216		2358
		2359	=item $ref = $ob->ref
		2360
		2361	creates and returns a persistent reference to an objetc that can be stored as a string.
		2362
		2363	=item $ob = cf::object::deref ($refstring)
		2364
		2365	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2366	even if the object actually exists. May block.
		2367
		2368	=cut
		2369
		2370	sub deref {
		2371	my ($ref) = @_;
		2372
		2373	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2374	my ($uuid, $name) = ($1, $2);
		2375	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2376	or return;
		2377	$pl->ob->uuid eq $uuid
		2378	or return;
		2379
		2380	$pl->ob
		2381	} else {
		2382	warn "$ref: cannot resolve object reference\n";
		2383	undef
		2384	}
		2385	}
		2386
2217	package cf;	2387	package cf;
2218		2388
2219	=back	2389	=back
2220		2390
2221	=head3 cf::object::player	2391	=head3 cf::object::player
…		…
2349	# use -1 or undef as default coordinates, not 0, 0	2519	# use -1 or undef as default coordinates, not 0, 0
2350	($x, $y) = ($map->enter_x, $map->enter_y)	2520	($x, $y) = ($map->enter_x, $map->enter_y)
2351	if $x <=0 && $y <= 0;	2521	if $x <=0 && $y <= 0;
2352		2522
2353	$map->load;	2523	$map->load;
2354	$map->load_diag;	2524	$map->load_neighbours;
2355		2525
2356	return unless $self->contr->active;	2526	return unless $self->contr->active;
2357	$self->activate_recursive;	2527	$self->activate_recursive;
2358		2528
2359	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2529	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2379	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2549	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380		2550
2381	$self->enter_link;	2551	$self->enter_link;
2382		2552
2383	(async {	2553	(async {
		2554	$Coro::current->{desc} = "player::goto $path $x $y";
		2555
		2556	# *tag paths override both path and x|y
		2557	if ($path =~ /^\*(.*)$/) {
		2558	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2559	my $ob = $obs[rand @obs];
		2560
		2561	# see if we actually can go there
		2562	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2563	$ob = $obs[rand @obs];
		2564	} else {
		2565	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2566	}
		2567	# else put us there anyways for now #d#
		2568
		2569	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2570	} else {
		2571	($path, $x, $y) = (undef, undef, undef);
		2572	}
		2573	}
		2574
2384	my $map = eval {	2575	my $map = eval {
2385	my $map = cf::map::find $path;	2576	my $map = defined $path ? cf::map::find $path : undef;
2386		2577
2387	if ($map) {	2578	if ($map) {
2388	$map = $map->customise_for ($self);	2579	$map = $map->customise_for ($self);
2389	$map = $check->($map) if $check && $map;	2580	$map = $check->($map) if $check && $map;
2390	} else {	2581	} else {
2391	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2582	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392	}	2583	}
2393		2584
2394	$map	2585	$map
2395	};	2586	};
2396		2587
…		…
2449	$rmp->{origin_y} = $exit->y;	2640	$rmp->{origin_y} = $exit->y;
2450	}	2641	}
2451		2642
2452	$rmp->{random_seed} ||= $exit->random_seed;	2643	$rmp->{random_seed} ||= $exit->random_seed;
2453		2644
2454	my $data = cf::to_json $rmp;	2645	my $data = cf::encode_json $rmp;
2455	my $md5 = Digest::MD5::md5_hex $data;	2646	my $md5 = Digest::MD5::md5_hex $data;
2456	my $meta = "$RANDOMDIR/$md5.meta";	2647	my $meta = "$RANDOMDIR/$md5.meta";
2457		2648
2458	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2649	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2459	aio_write $fh, 0, (length $data), $data, 0;	2650	aio_write $fh, 0, (length $data), $data, 0;
…		…
2486	# if exit is damned, update players death & WoR home-position	2677	# if exit is damned, update players death & WoR home-position
2487	$self->contr->savebed ($slaying, $hp, $sp)	2678	$self->contr->savebed ($slaying, $hp, $sp)
2488	if $exit->flag (FLAG_DAMNED);	2679	if $exit->flag (FLAG_DAMNED);
2489		2680
2490	(async {	2681	(async {
		2682	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2683
2491	$self->deactivate_recursive; # just to be sure	2684	$self->deactivate_recursive; # just to be sure
2492	unless (eval {	2685	unless (eval {
2493	$self->goto ($slaying, $hp, $sp);	2686	$self->goto ($slaying, $hp, $sp);
2494		2687
2495	1;	2688	1;
…		…
2530	the message, with C<log> being the default. If C<$color> is negative, suppress	2723	the message, with C<log> being the default. If C<$color> is negative, suppress
2531	the message unless the client supports the msg packet.	2724	the message unless the client supports the msg packet.
2532		2725
2533	=cut	2726	=cut
2534		2727
		2728	# non-persistent channels (usually the info channel)
		2729	our %CHANNEL = (
		2730	"c/identify" => {
		2731	id => "infobox",
		2732	title => "Identify",
		2733	reply => undef,
		2734	tooltip => "Items recently identified",
		2735	},
		2736	"c/examine" => {
		2737	id => "infobox",
		2738	title => "Examine",
		2739	reply => undef,
		2740	tooltip => "Signs and other items you examined",
		2741	},
		2742	"c/book" => {
		2743	id => "infobox",
		2744	title => "Book",
		2745	reply => undef,
		2746	tooltip => "The contents of a note or book",
		2747	},
		2748	"c/lookat" => {
		2749	id => "infobox",
		2750	title => "Look",
		2751	reply => undef,
		2752	tooltip => "What you saw there",
		2753	},
		2754	"c/who" => {
		2755	id => "infobox",
		2756	title => "Players",
		2757	reply => undef,
		2758	tooltip => "Shows players who are currently online",
		2759	},
		2760	"c/body" => {
		2761	id => "infobox",
		2762	title => "Body Parts",
		2763	reply => undef,
		2764	tooltip => "Shows which body parts you posess and are available",
		2765	},
		2766	"c/uptime" => {
		2767	id => "infobox",
		2768	title => "Uptime",
		2769	reply => undef,
		2770	tooltip => "How long the server has been running since last restart",
		2771	},
		2772	"c/mapinfo" => {
		2773	id => "infobox",
		2774	title => "Map Info",
		2775	reply => undef,
		2776	tooltip => "Information related to the maps",
		2777	},
		2778	);
		2779
2535	sub cf::client::send_msg {	2780	sub cf::client::send_msg {
2536	my ($self, $channel, $msg, $color, @extra) = @_;	2781	my ($self, $channel, $msg, $color, @extra) = @_;
2537		2782
2538	$msg = $self->pl->expand_cfpod ($msg);	2783	$msg = $self->pl->expand_cfpod ($msg);
2539		2784
2540	$color &= cf::NDI_CLIENT_MASK; # just in case...	2785	$color &= cf::NDI_CLIENT_MASK; # just in case...
2541		2786
		2787	# check predefined channels, for the benefit of C
		2788	if ($CHANNEL{$channel}) {
		2789	$channel = $CHANNEL{$channel};
		2790
		2791	$self->ext_msg (channel_info => $channel)
		2792	if $self->can_msg;
		2793
		2794	$channel = $channel->{id};
		2795
2542	if (ref $channel) {	2796	} elsif (ref $channel) {
2543	# send meta info to client, if not yet sent	2797	# send meta info to client, if not yet sent
2544	unless (exists $self->{channel}{$channel->{id}}) {	2798	unless (exists $self->{channel}{$channel->{id}}) {
2545	$self->{channel}{$channel->{id}} = $channel;	2799	$self->{channel}{$channel->{id}} = $channel;
2546	$self->ext_msg (channel_info => $channel);	2800	$self->ext_msg (channel_info => $channel)
		2801	if $self->can_msg;
2547	}	2802	}
2548		2803
2549	$channel = $channel->{id};	2804	$channel = $channel->{id};
2550	}	2805	}
2551		2806
…		…
2573	$color &= cf::NDI_COLOR_MASK;	2828	$color &= cf::NDI_COLOR_MASK;
2574		2829
2575	utf8::encode $msg;	2830	utf8::encode $msg;
2576		2831
2577	if (0 && $msg =~ /\[/) {	2832	if (0 && $msg =~ /\[/) {
		2833	# COMMAND/INFO
2578	$self->send_packet ("drawextinfo $color 4 0 $msg")	2834	$self->send_packet ("drawextinfo $color 10 8 $msg")
2579	} else {	2835	} else {
2580	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2836	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581	$self->send_packet ("drawinfo $color $msg")	2837	$self->send_packet ("drawinfo $color $msg")
2582	}	2838	}
2583	}	2839	}
…		…
2591	=cut	2847	=cut
2592		2848
2593	sub cf::client::ext_msg($$@) {	2849	sub cf::client::ext_msg($$@) {
2594	my ($self, $type, @msg) = @_;	2850	my ($self, $type, @msg) = @_;
2595		2851
2596	my $extcmd = $self->extcmd;
2597
2598	if ($extcmd == 2) {	2852	if ($self->extcmd == 2) {
2599	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	2853	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600	} elsif ($extcmd == 1) { # TODO: remove	2854	} elsif ($self->extcmd == 1) { # TODO: remove
2601	push @msg, msgtype => "event_$type";	2855	push @msg, msgtype => "event_$type";
		2856	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2857	}
		2858	}
		2859
		2860	=item $client->ext_reply ($msgid, @msg)
		2861
		2862	Sends an ext reply to the client.
		2863
		2864	=cut
		2865
		2866	sub cf::client::ext_reply($$@) {
		2867	my ($self, $id, @msg) = @_;
		2868
		2869	if ($self->extcmd == 2) {
		2870	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2871	} elsif ($self->extcmd == 1) {
		2872	#TODO: version 1, remove
		2873	unshift @msg, msgtype => "reply", msgid => $id;
2602	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2874	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603	}	2875	}
2604	}	2876	}
2605		2877
2606	=item $success = $client->query ($flags, "text", \&cb)	2878	=item $success = $client->query ($flags, "text", \&cb)
…		…
2668	my ($type, $reply, @payload) =	2940	my ($type, $reply, @payload) =
2669	"ARRAY" eq ref $msg	2941	"ARRAY" eq ref $msg
2670	? @$msg	2942	? @$msg
2671	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	2943	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672		2944
		2945	my @reply;
		2946
2673	if (my $cb = $EXTICMD{$type}) {	2947	if (my $cb = $EXTICMD{$type}) {
2674	my @reply = $cb->($ns, @payload);	2948	@reply = $cb->($ns, @payload);
2675
2676	$ns->ext_reply ($reply, @reply)
2677	if $reply;
2678	}	2949	}
		2950
		2951	$ns->ext_reply ($reply, @reply)
		2952	if $reply;
		2953
2679	} else {	2954	} else {
2680	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2955	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681	}	2956	}
2682		2957
2683	cf::override;	2958	cf::override;
…		…
2743	=pod	3018	=pod
2744		3019
2745	The following functions and methods are available within a safe environment:	3020	The following functions and methods are available within a safe environment:
2746		3021
2747	cf::object	3022	cf::object
2748	contr pay_amount pay_player map x y force_find force_add	3023	contr pay_amount pay_player map x y force_find force_add destroy
2749	insert remove name archname title slaying race	3024	insert remove name archname title slaying race decrease_ob_nr
2750		3025
2751	cf::object::player	3026	cf::object::player
2752	player	3027	player
2753		3028
2754	cf::player	3029	cf::player
…		…
2759		3034
2760	=cut	3035	=cut
2761		3036
2762	for (	3037	for (
2763	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3038	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764	insert remove inv name archname title slaying race)],	3039	insert remove inv name archname title slaying race
		3040	decrease_ob_nr destroy)],
2765	["cf::object::player" => qw(player)],	3041	["cf::object::player" => qw(player)],
2766	["cf::player" => qw(peaceful)],	3042	["cf::player" => qw(peaceful)],
2767	["cf::map" => qw(trigger)],	3043	["cf::map" => qw(trigger)],
2768	) {	3044	) {
2769	no strict 'refs';	3045	no strict 'refs';
…		…
2845	# the server's init and main functions	3121	# the server's init and main functions
2846		3122
2847	sub load_facedata($) {	3123	sub load_facedata($) {
2848	my ($path) = @_;	3124	my ($path) = @_;
2849		3125
		3126	# HACK to clear player env face cache, we need some signal framework
		3127	# for this (global event?)
		3128	%ext::player_env::MUSIC_FACE_CACHE = ();
		3129
		3130	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3131
2850	warn "loading facedata from $path\n";	3132	warn "loading facedata from $path\n";
2851		3133
2852	my $facedata;	3134	my $facedata;
2853	0 < aio_load $path, $facedata	3135	0 < aio_load $path, $facedata
2854	or die "$path: $!";	3136	or die "$path: $!";
…		…
2856	$facedata = Coro::Storable::thaw $facedata;	3138	$facedata = Coro::Storable::thaw $facedata;
2857		3139
2858	$facedata->{version} == 2	3140	$facedata->{version} == 2
2859	or cf::cleanup "$path: version mismatch, cannot proceed.";	3141	or cf::cleanup "$path: version mismatch, cannot proceed.";
2860		3142
		3143	# patch in the exptable
		3144	$facedata->{resource}{"res/exp_table"} = {
		3145	type => FT_RSRC,
		3146	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3147	};
		3148	cf::cede_to_tick;
		3149
2861	{	3150	{
2862	my $faces = $facedata->{faceinfo};	3151	my $faces = $facedata->{faceinfo};
2863		3152
2864	while (my ($face, $info) = each %$faces) {	3153	while (my ($face, $info) = each %$faces) {
2865	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3154	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3155
2866	cf::face::set_visibility $idx, $info->{visibility};	3156	cf::face::set_visibility $idx, $info->{visibility};
2867	cf::face::set_magicmap $idx, $info->{magicmap};	3157	cf::face::set_magicmap $idx, $info->{magicmap};
2868	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3158	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3159	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870		3160
2871	cf::cede_to_tick;	3161	cf::cede_to_tick;
2872	}	3162	}
2873		3163
2874	while (my ($face, $info) = each %$faces) {	3164	while (my ($face, $info) = each %$faces) {
2875	next unless $info->{smooth};	3165	next unless $info->{smooth};
		3166
2876	my $idx = cf::face::find $face	3167	my $idx = cf::face::find $face
2877	or next;	3168	or next;
		3169
2878	if (my $smooth = cf::face::find $info->{smooth}) {	3170	if (my $smooth = cf::face::find $info->{smooth}) {
2879	cf::face::set_smooth $idx, $smooth;	3171	cf::face::set_smooth $idx, $smooth;
2880	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3172	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2881	} else {	3173	} else {
2882	warn "smooth face '$info->{smooth}' not found for face '$face'";	3174	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
2899		3191
2900	{	3192	{
2901	# TODO: for gcfclient pleasure, we should give resources	3193	# TODO: for gcfclient pleasure, we should give resources
2902	# that gcfclient doesn't grok a >10000 face index.	3194	# that gcfclient doesn't grok a >10000 face index.
2903	my $res = $facedata->{resource};	3195	my $res = $facedata->{resource};
2904	my $enc = JSON::XS->new->utf8->canonical;
2905
2906	my $soundconf = delete $res->{"res/sound.conf"};
2907		3196
2908	while (my ($name, $info) = each %$res) {	3197	while (my ($name, $info) = each %$res) {
2909	my $meta = $enc->encode ({	3198	if (defined $info->{type}) {
2910	name => $name,
2911	%{ $info->{meta} || {} },
2912	});
2913
2914	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3199	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3200	my $data;
2915		3201
2916	if ($info->{type} & 1) {	3202	if ($info->{type} & 1) {
2917	# prepend meta info	3203	# prepend meta info
2918		3204
		3205	my $meta = $enc->encode ({
		3206	name => $name,
		3207	%{ $info->{meta} || {} },
		3208	});
		3209
2919	my $data = pack "(w/a*)*", $meta, $info->{data};	3210	$data = pack "(w/a*)*", $meta, $info->{data};
2920	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata	3211	} else {
		3212	$data = $info->{data};
		3213	}
2921		3214
2922	cf::face::set_data $idx, 0, $data, $chk;	3215	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3216	cf::face::set_type $idx, $info->{type};
2923	} else {	3217	} else {
2924	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};	3218	$RESOURCE{$name} = $info;
2925	}	3219	}
2926		3220
2927	cf::face::set_type $idx, $info->{type};
2928
2929	cf::cede_to_tick;	3221	cf::cede_to_tick;
2930	}	3222	}
2931		3223
2932	if ($soundconf) {	3224	if (my $soundconf = delete $res->{"res/sound.conf"}) {
2933	$soundconf = $enc->decode (delete $soundconf->{data});	3225	$soundconf = $enc->decode (delete $soundconf->{data});
2934		3226
2935	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3227	for (0 .. SOUND_CAST_SPELL_0 - 1) {
2936	my $sound = $soundconf->{compat}[$_]	3228	my $sound = $soundconf->{compat}[$_]
2937	or next;	3229	or next;
…		…
2958	$ns->fx_want ($k, $v);	3250	$ns->fx_want ($k, $v);
2959	}	3251	}
2960	};	3252	};
2961		3253
2962	sub reload_regions {	3254	sub reload_regions {
		3255	# HACK to clear player env face cache, we need some signal framework
		3256	# for this (global event?)
		3257	%ext::player_env::MUSIC_FACE_CACHE = ();
		3258
2963	load_resource_file "$MAPDIR/regions"	3259	load_resource_file "$MAPDIR/regions"
2964	or die "unable to load regions file\n";	3260	or die "unable to load regions file\n";
2965		3261
2966	for (cf::region::list) {	3262	for (cf::region::list) {
2967	$_->{match} = qr/$_->{match}/	3263	$_->{match} = qr/$_->{match}/
…		…
3003		3299
3004	sub init {	3300	sub init {
3005	reload_resources;	3301	reload_resources;
3006	}	3302	}
3007		3303
3008	sub cfg_load {	3304	sub reload_config {
3009	open my $fh, "<:utf8", "$CONFDIR/config"	3305	open my $fh, "<:utf8", "$CONFDIR/config"
3010	or return;	3306	or return;
3011		3307
3012	local $/;	3308	local $/;
3013	*CFG = YAML::Syck::Load <$fh>;	3309	*CFG = YAML::Syck::Load <$fh>;
…		…
3029	sub main {	3325	sub main {
3030	# we must not ever block the main coroutine	3326	# we must not ever block the main coroutine
3031	local $Coro::idle = sub {	3327	local $Coro::idle = sub {
3032	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3328	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3033	(async {	3329	(async {
3034	Event::one_event;	3330	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3331	EV::loop EV::LOOP_ONESHOT;
3035	})->prio (Coro::PRIO_MAX);	3332	})->prio (Coro::PRIO_MAX);
3036	};	3333	};
3037		3334
3038	cfg_load;	3335	reload_config;
3039	db_init;	3336	db_init;
3040	load_extensions;	3337	load_extensions;
3041		3338
3042	$TICK_WATCHER->start;	3339	$TICK_WATCHER->start;
		3340	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3043	Event::loop;	3341	EV::loop;
3044	}	3342	}
3045		3343
3046	#############################################################################	3344	#############################################################################
3047	# initialisation and cleanup	3345	# initialisation and cleanup
3048		3346
3049	# install some emergency cleanup handlers	3347	# install some emergency cleanup handlers
3050	BEGIN {	3348	BEGIN {
		3349	our %SIGWATCHER = ();
3051	for my $signal (qw(INT HUP TERM)) {	3350	for my $signal (qw(INT HUP TERM)) {
3052	Event->signal (	3351	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3053	reentrant => 0,
3054	data => WF_AUTOCANCEL,
3055	signal => $signal,
3056	prio => 0,
3057	cb => sub {
3058	cf::cleanup "SIG$signal";	3352	cf::cleanup "SIG$signal";
3059	},
3060	);	3353	};
3061	}	3354	}
3062	}	3355	}
3063		3356
3064	sub write_runtime {	3357	sub write_runtime {
3065	my $runtime = "$LOCALDIR/runtime";	3358	my $runtime = "$LOCALDIR/runtime";
…		…
3110	# and maps saved/destroyed asynchronously.	3403	# and maps saved/destroyed asynchronously.
3111	warn "begin emergency player save\n";	3404	warn "begin emergency player save\n";
3112	for my $login (keys %cf::PLAYER) {	3405	for my $login (keys %cf::PLAYER) {
3113	my $pl = $cf::PLAYER{$login} or next;	3406	my $pl = $cf::PLAYER{$login} or next;
3114	$pl->valid or next;	3407	$pl->valid or next;
		3408	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3115	$pl->save;	3409	$pl->save;
3116	}	3410	}
3117	warn "end emergency player save\n";	3411	warn "end emergency player save\n";
3118		3412
3119	warn "begin emergency map save\n";	3413	warn "begin emergency map save\n";
…		…
3158	warn "syncing database to disk";	3452	warn "syncing database to disk";
3159	BDB::db_env_txn_checkpoint $DB_ENV;	3453	BDB::db_env_txn_checkpoint $DB_ENV;
3160		3454
3161	# if anything goes wrong in here, we should simply crash as we already saved	3455	# if anything goes wrong in here, we should simply crash as we already saved
3162		3456
3163	warn "cancelling all WF_AUTOCANCEL watchers";
3164	for (Event::all_watchers) {
3165	$_->cancel if $_->data & WF_AUTOCANCEL;
3166	}
3167
3168	warn "flushing outstanding aio requests";	3457	warn "flushing outstanding aio requests";
3169	for (;;) {	3458	for (;;) {
3170	BDB::flush;	3459	BDB::flush;
3171	IO::AIO::flush;	3460	IO::AIO::flush;
3172	Coro::cede;	3461	Coro::cede_notself;
3173	last unless IO::AIO::nreqs || BDB::nreqs;	3462	last unless IO::AIO::nreqs || BDB::nreqs;
3174	warn "iterate...";	3463	warn "iterate...";
3175	}	3464	}
3176		3465
3177	++$RELOAD;	3466	++$RELOAD;
…		…
3236	warn "reloading cf.pm";	3525	warn "reloading cf.pm";
3237	require cf;	3526	require cf;
3238	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3527	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239		3528
3240	warn "loading config and database again";	3529	warn "loading config and database again";
3241	cf::cfg_load;	3530	cf::reload_config;
3242		3531
3243	warn "loading extensions";	3532	warn "loading extensions";
3244	cf::load_extensions;	3533	cf::load_extensions;
3245		3534
3246	warn "reattaching attachments to objects/players";	3535	warn "reattaching attachments to objects/players";
…		…
3266		3555
3267	sub reload_perl() {	3556	sub reload_perl() {
3268	# doing reload synchronously and two reloads happen back-to-back,	3557	# doing reload synchronously and two reloads happen back-to-back,
3269	# coro crashes during coro_state_free->destroy here.	3558	# coro crashes during coro_state_free->destroy here.
3270		3559
3271	$RELOAD_WATCHER ||= Event->timer (	3560	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3272	reentrant => 0,
3273	after => 0,
3274	data => WF_AUTOCANCEL,
3275	cb => sub {
3276	do_reload_perl;
3277	undef $RELOAD_WATCHER;	3561	undef $RELOAD_WATCHER;
3278	},	3562	do_reload_perl;
3279	);	3563	};
3280	}	3564	}
3281		3565
3282	register_command "reload" => sub {	3566	register_command "reload" => sub {
3283	my ($who, $arg) = @_;	3567	my ($who, $arg) = @_;
3284		3568
3285	if ($who->flag (FLAG_WIZ)) {	3569	if ($who->flag (FLAG_WIZ)) {
3286	$who->message ("reloading server.");	3570	$who->message ("reloading server.");
		3571	async {
		3572	$Coro::current->{desc} = "perl_reload";
3287	async { reload_perl };	3573	reload_perl;
		3574	};
3288	}	3575	}
3289	};	3576	};
3290		3577
3291	unshift @INC, $LIBDIR;	3578	unshift @INC, $LIBDIR;
3292		3579
…		…
3311	my $signal = new Coro::Signal;	3598	my $signal = new Coro::Signal;
3312	push @WAIT_FOR_TICK_BEGIN, $signal;	3599	push @WAIT_FOR_TICK_BEGIN, $signal;
3313	$signal->wait;	3600	$signal->wait;
3314	}	3601	}
3315		3602
3316	my $min = 1e6;#d#	3603	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3317	my $avg = 10;
3318	$TICK_WATCHER = Event->timer (
3319	reentrant => 0,
3320	parked => 1,
3321	prio => 0,
3322	at => $NEXT_TICK || $TICK,
3323	data => WF_AUTOCANCEL,
3324	cb => sub {
3325	if ($Coro::current != $Coro::main) {	3604	if ($Coro::current != $Coro::main) {
3326	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3605	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3327	unless ++$bug_warning > 10;	3606	unless ++$bug_warning > 10;
3328	return;	3607	return;
3329	}	3608	}
3330		3609
3331	$NOW = $tick_start = Event::time;	3610	$NOW = $tick_start = EV::now;
3332		3611
3333	cf::server_tick; # one server iteration	3612	cf::server_tick; # one server iteration
3334		3613
3335	0 && sync_job {#d#	3614	$RUNTIME += $TICK;
3336	for(1..10) {	3615	$NEXT_TICK = $_[0]->at;
3337	my $t = Event::time;
3338	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3339	or die;
3340		3616
3341	$map->width (50);	3617	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3342	$map->height (50);	3618	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3343	$map->alloc;	3619	Coro::async_pool {
3344	$map->_load_objects ("/tmp/x.map", 1);	3620	$Coro::current->{desc} = "runtime saver";
3345	my $t = Event::time - $t;	3621	write_runtime
3346		3622	or warn "ERROR: unable to write runtime file: $!";
3347	#next unless $t < 0.0013;#d#
3348	if ($t < $min) {
3349	$min = $t;
3350	}
3351	$avg = $avg * 0.99 + $t * 0.01;
3352	}
3353	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354	exit 0;
3355	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356	};	3623	};
		3624	}
3357		3625
3358	$RUNTIME += $TICK;
3359	$NEXT_TICK += $TICK;
3360
3361	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362	$NEXT_RUNTIME_WRITE = $NOW + 10;
3363	Coro::async_pool {
3364	write_runtime
3365	or warn "ERROR: unable to write runtime file: $!";
3366	};
3367	}
3368
3369	# my $AFTER = Event::time;
3370	# warn $AFTER - $NOW;#d#
3371
3372	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3626	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373	$sig->send;	3627	$sig->send;
3374	}	3628	}
3375	while (my $sig = shift @WAIT_FOR_TICK) {	3629	while (my $sig = shift @WAIT_FOR_TICK) {
3376	$sig->send;	3630	$sig->send;
3377	}	3631	}
3378		3632
3379	$NOW = Event::time;
3380
3381	# if we are delayed by four ticks or more, skip them all
3382	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3383
3384	$TICK_WATCHER->at ($NEXT_TICK);
3385	$TICK_WATCHER->start;
3386
3387	$LOAD = ($NOW - $tick_start) / $TICK;	3633	$LOAD = ($NOW - $tick_start) / $TICK;
3388	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3634	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389		3635
3390	_post_tick;	3636	_post_tick;
3391		3637	};
3392		3638	$TICK_WATCHER->priority (EV::MAXPRI);
3393	},
3394	);
3395		3639
3396	{	3640	{
3397	BDB::max_poll_time $TICK * 0.1;	3641	# configure BDB
3398	$BDB_POLL_WATCHER = Event->io (	3642
3399	reentrant => 0,
3400	fd => BDB::poll_fileno,
3401	poll => 'r',
3402	prio => 0,
3403	data => WF_AUTOCANCEL,
3404	cb => \&BDB::poll_cb,
3405	);
3406	BDB::min_parallel 8;	3643	BDB::min_parallel 8;
3407		3644	BDB::max_poll_reqs $TICK * 0.1;
3408	BDB::set_sync_prepare {	3645	$Coro::BDB::WATCHER->priority (1);
3409	my $status;
3410	my $current = $Coro::current;
3411	(
3412	sub {
3413	$status = $!;
3414	$current->ready; undef $current;
3415	},
3416	sub {
3417	Coro::schedule while defined $current;
3418	$! = $status;
3419	},
3420	)
3421	};
3422		3646
3423	unless ($DB_ENV) {	3647	unless ($DB_ENV) {
3424	$DB_ENV = BDB::db_env_create;	3648	$DB_ENV = BDB::db_env_create;
		3649	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3650	| BDB::LOG_AUTOREMOVE, 1);
		3651	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3652	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3425		3653
3426	cf::sync_job {	3654	cf::sync_job {
3427	eval {	3655	eval {
3428	BDB::db_env_open	3656	BDB::db_env_open
3429	$DB_ENV,	3657	$DB_ENV,
…		…
3431	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3659	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3432	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3660	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433	0666;	3661	0666;
3434		3662
3435	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3663	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438	$DB_ENV->set_lk_detect;
3439	};	3664	};
3440		3665
3441	cf::cleanup "db_env_open(db): $@" if $@;	3666	cf::cleanup "db_env_open(db): $@" if $@;
3442	};	3667	};
3443	}	3668	}
		3669
		3670	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3671	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3672	};
		3673	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3674	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3675	};
		3676	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3677	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3678	};
3444	}	3679	}
3445		3680
3446	{	3681	{
		3682	# configure IO::AIO
		3683
3447	IO::AIO::min_parallel 8;	3684	IO::AIO::min_parallel 8;
3448
3449	undef $Coro::AIO::WATCHER;
3450	IO::AIO::max_poll_time $TICK * 0.1;	3685	IO::AIO::max_poll_time $TICK * 0.1;
3451	$AIO_POLL_WATCHER = Event->io (	3686	$Coro::AIO::WATCHER->priority (1);
3452	reentrant => 0,
3453	data => WF_AUTOCANCEL,
3454	fd => IO::AIO::poll_fileno,
3455	poll => 'r',
3456	prio => 6,
3457	cb => \&IO::AIO::poll_cb,
3458	);
3459	}	3687	}
3460		3688
3461	my $_log_backtrace;	3689	my $_log_backtrace;
3462		3690
3463	sub _log_backtrace {	3691	sub _log_backtrace {
…		…
3467		3695
3468	# limit the # of concurrent backtraces	3696	# limit the # of concurrent backtraces
3469	if ($_log_backtrace < 2) {	3697	if ($_log_backtrace < 2) {
3470	++$_log_backtrace;	3698	++$_log_backtrace;
3471	async {	3699	async {
		3700	$Coro::current->{desc} = "abt $msg";
		3701
3472	my @bt = fork_call {	3702	my @bt = fork_call {
3473	@addr = map { sprintf "%x", $_ } @addr;	3703	@addr = map { sprintf "%x", $_ } @addr;
3474	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3704	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3705	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3476	or die "addr2line: $!";	3706	or die "addr2line: $!";

Diff Legend

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