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.324 by root, Sat Jul 28 14:23:17 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
…		…
1370	$self->{deny_save} = 1;	1439	$self->{deny_save} = 1;
1371		1440
1372	$cf::PLAYER{$login} = $self;	1441	$cf::PLAYER{$login} = $self;
1373		1442
1374	$self	1443	$self
		1444	}
		1445
		1446	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1447
		1448	=cut
		1449
		1450	sub send_msg {
		1451	my $ns = shift->ns
		1452	or return;
		1453	$ns->send_msg (@_);
1375	}	1454	}
1376		1455
1377	=item $pl->quit_character	1456	=item $pl->quit_character
1378		1457
1379	Nukes the player without looking back. If logged in, the connection will	1458	Nukes the player without looking back. If logged in, the connection will
…		…
1434	or return [];	1513	or return [];
1435		1514
1436	my @logins;	1515	my @logins;
1437		1516
1438	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") {
1439	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1522	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440	aio_read $fh, 0, 512, my $buf, 0 or next;	1523	aio_read $fh, 0, 512, my $buf, 0 or next;
1441	$buf !~ /^password -------------$/m or next; # official not-valid tag	1524	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1525	}
1442		1526
1443	utf8::decode $login;	1527	utf8::decode $login;
1444	push @logins, $login;	1528	push @logins, $login;
1445	}	1529	}
1446		1530
…		…
1479		1563
1480	Expand crossfire pod fragments into protocol xml.	1564	Expand crossfire pod fragments into protocol xml.
1481		1565
1482	=cut	1566	=cut
1483		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
1484	sub expand_cfpod {	1579	sub expand_cfpod {
1485	((my $self), (local $_)) = @_;	1580	my ($self, $pod) = @_;
1486		1581
1487	# escape & and <	1582	my $xml;
1488	s/&/&amp;/g;
1489	s/(?<![BIUGH])</&lt;/g;
1490		1583
1491	# this is buggy, it needs to properly take care of nested <'s	1584	while () {
		1585	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1586	$group = $1;
1492		1587
1493	1 while	1588	$group =~ s/&/&amp;/g;
1494	# replace B<>, I<>, U<> etc.	1589	$group =~ s/</&lt;/g;
1495	s/B<([^\>]*)>/<b>$1<\/b>/	1590
1496	|| s/I<([^\>]*)>/<i>$1<\/i>/	1591	$xml .= $group;
1497	|| s/U<([^\>]*)>/<u>$1<\/u>/	1592	} elsif ($pod =~ m%\G
1498	# replace G<male|female> tags	1593	([BCGHITU])
1499	|| s{G<([^>|]*)\|([^>]*)>}{	1594	<
1500	$self->gender ? $2 : $1	1595	(?:
1501	}ge	1596	([^<>]*) (?{ $group = $^N })
1502	# replace H<hint text>	1597	| < $interior >
1503	|| s{H<([^\>]*)>}	1598	)
		1599	>
		1600	%gcsx
1504	{	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") {
1505	("<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>",
1506	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1620	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507	"")	1621	"")
1508	[$self->{hintmode}]	1622	[$self->{hintmode}];
		1623	} else {
		1624	$xml .= "error processing '$code($data)' directive";
1509	}ge;	1625	}
		1626	} else {
		1627	if ($pod =~ /\G(.+)/) {
		1628	warn "parse error while expanding $pod (at $1)";
		1629	}
		1630	last;
		1631	}
		1632	}
1510		1633
		1634	for ($xml) {
1511	# create single paragraphs (very hackish)	1635	# create single paragraphs (very hackish)
1512	s/(?<=\S)\n(?=\w)/ /g;	1636	s/(?<=\S)\n(?=\w)/ /g;
1513		1637
1514	# compress some whitespace	1638	# compress some whitespace
1515	s/\s+\n/\n/g; # ws line-ends	1639	s/\s+\n/\n/g; # ws line-ends
1516	s/\n\n+/\n/g; # double lines	1640	s/\n\n+/\n/g; # double lines
1517	s/^\n+//; # beginning lines	1641	s/^\n+//; # beginning lines
1518	s/\n+$//; # ending lines	1642	s/\n+$//; # ending lines
		1643	}
1519		1644
1520	$_	1645	$xml
1521	}	1646	}
		1647
		1648	no re 'eval';
1522		1649
1523	sub hintmode {	1650	sub hintmode {
1524	$_[0]{hintmode} = $_[1] if @_ > 1;	1651	$_[0]{hintmode} = $_[1] if @_ > 1;
1525	$_[0]{hintmode}	1652	$_[0]{hintmode}
1526	}	1653	}
…		…
1532	=cut	1659	=cut
1533		1660
1534	sub ext_reply($$@) {	1661	sub ext_reply($$@) {
1535	my ($self, $id, @msg) = @_;	1662	my ($self, $id, @msg) = @_;
1536		1663
1537	if ($self->ns->extcmd == 2) {	1664	$self->ns->ext_reply ($id, @msg)
1538	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539	} elsif ($self->ns->extcmd == 1) {
1540	#TODO: version 1, remove
1541	unshift @msg, msgtype => "reply", msgid => $id;
1542	$self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543	}
1544	}	1665	}
1545		1666
1546	=item $player->ext_msg ($type, @msg)	1667	=item $player->ext_msg ($type, @msg)
1547		1668
1548	Sends an ext event to the client.	1669	Sends an ext event to the client.
…		…
1776		1897
1777	sub load_header_from($) {	1898	sub load_header_from($) {
1778	my ($self, $path) = @_;	1899	my ($self, $path) = @_;
1779		1900
1780	utf8::encode $path;	1901	utf8::encode $path;
1781	#aio_open $path, O_RDONLY, 0	1902	my $f = new_from_file cf::object::thawer $path
1782	# or return;
1783
1784	$self->_load_header ($path)
1785	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;
1786		1910
1787	$self->{load_path} = $path;	1911	$self->{load_path} = $path;
1788		1912
1789	1	1913	1
1790	}	1914	}
…		…
1844	sub find {	1968	sub find {
1845	my ($path, $origin) = @_;	1969	my ($path, $origin) = @_;
1846		1970
1847	$path = normalise $path, $origin && $origin->path;	1971	$path = normalise $path, $origin && $origin->path;
1848		1972
		1973	cf::lock_wait "map_data:$path";#d#remove
1849	cf::lock_wait "map_find:$path";	1974	cf::lock_wait "map_find:$path";
1850		1975
1851	$cf::MAP{$path} || do {	1976	$cf::MAP{$path} || do {
1852	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
1853	my $map = new_from_path cf::map $path	1980	my $map = new_from_path cf::map $path
1854	or return;	1981	or return;
1855		1982
1856	$map->{last_save} = $cf::RUNTIME;	1983	$map->{last_save} = $cf::RUNTIME;
1857		1984
…		…
1859	or return;	1986	or return;
1860		1987
1861	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1988	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862	# doing this can freeze the server in a sync job, obviously	1989	# doing this can freeze the server in a sync job, obviously
1863	#$cf::WAIT_FOR_TICK->wait;	1990	#$cf::WAIT_FOR_TICK->wait;
		1991	undef $guard1;
		1992	undef $guard2;
1864	$map->reset;	1993	$map->reset;
1865	undef $guard;
1866	return find $path;	1994	return find $path;
1867	}	1995	}
1868		1996
1869	$cf::MAP{$path} = $map	1997	$cf::MAP{$path} = $map
1870	}	1998	}
…		…
1879	local $self->{deny_reset} = 1; # loading can take a long time	2007	local $self->{deny_reset} = 1; # loading can take a long time
1880		2008
1881	my $path = $self->{path};	2009	my $path = $self->{path};
1882		2010
1883	{	2011	{
1884	my $guard = cf::lock_acquire "map_load:$path";	2012	my $guard = cf::lock_acquire "map_data:$path";
1885		2013
		2014	return unless $self->valid;
1886	return if $self->in_memory != cf::MAP_SWAPPED;	2015	return unless $self->in_memory == cf::MAP_SWAPPED;
1887		2016
1888	$self->in_memory (cf::MAP_LOADING);	2017	$self->in_memory (cf::MAP_LOADING);
1889		2018
1890	$self->alloc;	2019	$self->alloc;
1891		2020
1892	$self->pre_load;	2021	$self->pre_load;
1893	Coro::cede;	2022	cf::cede_to_tick;
1894		2023
		2024	my $f = new_from_file cf::object::thawer $self->{load_path};
		2025	$f->skip_block;
1895	$self->_load_objects ($self->{load_path}, 1)	2026	$self->_load_objects ($f)
1896	or return;	2027	or return;
1897		2028
1898	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2029	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899	if delete $self->{load_original};	2030	if delete $self->{load_original};
1900		2031
1901	if (my $uniq = $self->uniq_path) {	2032	if (my $uniq = $self->uniq_path) {
1902	utf8::encode $uniq;	2033	utf8::encode $uniq;
1903	if (aio_open $uniq, O_RDONLY, 0) {	2034	unless (aio_stat $uniq) {
		2035	if (my $f = new_from_file cf::object::thawer $uniq) {
1904	$self->clear_unique_items;	2036	$self->clear_unique_items;
1905	$self->_load_objects ($uniq, 0);	2037	$self->_load_objects ($f);
		2038	$f->resolve_delayed_derefs;
		2039	}
1906	}	2040	}
1907	}	2041	}
1908		2042
1909	Coro::cede;	2043	$f->resolve_delayed_derefs;
		2044
		2045	cf::cede_to_tick;
1910	# now do the right thing for maps	2046	# now do the right thing for maps
1911	$self->link_multipart_objects;	2047	$self->link_multipart_objects;
1912	$self->difficulty ($self->estimate_difficulty)	2048	$self->difficulty ($self->estimate_difficulty)
1913	unless $self->difficulty;	2049	unless $self->difficulty;
1914	Coro::cede;	2050	cf::cede_to_tick;
1915		2051
1916	unless ($self->{deny_activate}) {	2052	unless ($self->{deny_activate}) {
1917	$self->decay_objects;	2053	$self->decay_objects;
1918	$self->fix_auto_apply;	2054	$self->fix_auto_apply;
1919	$self->update_buttons;	2055	$self->update_buttons;
1920	Coro::cede;	2056	cf::cede_to_tick;
1921	$self->set_darkness_map;	2057	$self->set_darkness_map;
1922	Coro::cede;	2058	cf::cede_to_tick;
1923	$self->activate;	2059	$self->activate;
1924	}	2060	}
1925		2061
1926	$map->{last_save} = $cf::RUNTIME;	2062	$self->{last_save} = $cf::RUNTIME;
1927	$map->last_access ($cf::RUNTIME);	2063	$self->last_access ($cf::RUNTIME);
1928		2064
1929	$self->in_memory (cf::MAP_IN_MEMORY);	2065	$self->in_memory (cf::MAP_IN_MEMORY);
1930	}	2066	}
1931		2067
1932	$self->post_load;	2068	$self->post_load;
…		…
1943		2079
1944	$self	2080	$self
1945	}	2081	}
1946		2082
1947	# 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
1948	sub load_diag {	2084	sub load_neighbours {
1949	my ($map) = @_;	2085	my ($map) = @_;
1950		2086
1951	my @diag; # diagonal neighbours	2087	my @neigh; # diagonal neighbours
1952		2088
1953	for (0 .. 3) {	2089	for (0 .. 3) {
1954	my $neigh = $map->tile_path ($_)	2090	my $neigh = $map->tile_path ($_)
1955	or next;	2091	or next;
1956	$neigh = find $neigh, $map	2092	$neigh = find $neigh, $map
1957	or next;	2093	or next;
1958	$neigh->load;	2094	$neigh->load;
1959		2095
		2096	push @neigh,
1960	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2097	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1961	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2098	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1962	}	2099	}
1963		2100
1964	for (@diag) {	2101	for (grep defined $_->[0], @neigh) {
		2102	my ($path, $origin) = @$_;
1965	my $neigh = find @$_	2103	my $neigh = find $path, $origin
1966	or next;	2104	or next;
1967	$neigh->load;	2105	$neigh->load;
1968	}	2106	}
1969	}	2107	}
1970		2108
…		…
1975	}	2113	}
1976		2114
1977	sub do_load_sync {	2115	sub do_load_sync {
1978	my ($map) = @_;	2116	my ($map) = @_;
1979		2117
		2118	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2119	if $Coro::current == $Coro::main;
		2120
1980	cf::sync_job { $map->load };	2121	cf::sync_job { $map->load };
1981	}	2122	}
1982		2123
1983	our %MAP_PREFETCH;	2124	our %MAP_PREFETCH;
1984	our $MAP_PREFETCHER = undef;	2125	our $MAP_PREFETCHER = undef;
1985		2126
1986	sub find_async {	2127	sub find_async {
1987	my ($path, $origin) = @_;	2128	my ($path, $origin, $load) = @_;
1988		2129
1989	$path = normalise $path, $origin && $origin->{path};	2130	$path = normalise $path, $origin && $origin->{path};
1990		2131
1991	if (my $map = $cf::MAP{$path}) {	2132	if (my $map = $cf::MAP{$path}) {
1992	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2133	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993	}	2134	}
1994		2135
1995	undef $MAP_PREFETCH{$path};	2136	$MAP_PREFETCH{$path} |= $load;
		2137
1996	$MAP_PREFETCHER ||= cf::async {	2138	$MAP_PREFETCHER ||= cf::async {
		2139	$Coro::current->{desc} = "map prefetcher";
		2140
1997	while (%MAP_PREFETCH) {	2141	while (%MAP_PREFETCH) {
1998	for my $path (keys %MAP_PREFETCH) {	2142	while (my ($k, $v) = each %MAP_PREFETCH) {
1999	if (my $map = find $path) {	2143	if (my $map = find $k) {
2000	$map->load;	2144	$map->load if $v;
2001	}	2145	}
2002		2146
2003	delete $MAP_PREFETCH{$path};	2147	delete $MAP_PREFETCH{$k};
2004	}	2148	}
2005	}	2149	}
2006	undef $MAP_PREFETCHER;	2150	undef $MAP_PREFETCHER;
2007	};	2151	};
2008	$MAP_PREFETCHER->prio (6);	2152	$MAP_PREFETCHER->prio (6);
…		…
2011	}	2155	}
2012		2156
2013	sub save {	2157	sub save {
2014	my ($self) = @_;	2158	my ($self) = @_;
2015		2159
2016	my $lock = cf::lock_acquire "map_data:" . $self->path;	2160	my $lock = cf::lock_acquire "map_data:$self->{path}";
2017		2161
2018	$self->{last_save} = $cf::RUNTIME;	2162	$self->{last_save} = $cf::RUNTIME;
2019		2163
2020	return unless $self->dirty;	2164	return unless $self->dirty;
2021		2165
…		…
2027	return if $self->{deny_save};	2171	return if $self->{deny_save};
2028		2172
2029	local $self->{last_access} = $self->last_access;#d#	2173	local $self->{last_access} = $self->last_access;#d#
2030		2174
2031	cf::async {	2175	cf::async {
		2176	$Coro::current->{desc} = "map player save";
2032	$_->contr->save for $self->players;	2177	$_->contr->save for $self->players;
2033	};	2178	};
2034		2179
2035	if ($uniq) {	2180	if ($uniq) {
2036	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2181	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
2044	my ($self) = @_;	2189	my ($self) = @_;
2045		2190
2046	# save first because save cedes	2191	# save first because save cedes
2047	$self->save;	2192	$self->save;
2048		2193
2049	my $lock = cf::lock_acquire "map_data:" . $self->path;	2194	my $lock = cf::lock_acquire "map_data:$self->{path}";
2050		2195
2051	return if $self->players;	2196	return if $self->players;
2052	return if $self->in_memory != cf::MAP_IN_MEMORY;	2197	return if $self->in_memory != cf::MAP_IN_MEMORY;
2053	return if $self->{deny_save};	2198	return if $self->{deny_save};
2054		2199
		2200	$self->in_memory (cf::MAP_SWAPPED);
		2201
		2202	$self->deactivate;
		2203	$_->clear_links_to ($self) for values %cf::MAP;
2055	$self->clear;	2204	$self->clear;
2056	$self->in_memory (cf::MAP_SWAPPED);
2057	}	2205	}
2058		2206
2059	sub reset_at {	2207	sub reset_at {
2060	my ($self) = @_;	2208	my ($self) = @_;
2061		2209
…		…
2093	if $uniq;	2241	if $uniq;
2094	}	2242	}
2095		2243
2096	delete $cf::MAP{$self->path};	2244	delete $cf::MAP{$self->path};
2097		2245
		2246	$self->deactivate;
		2247	$_->clear_links_to ($self) for values %cf::MAP;
2098	$self->clear;	2248	$self->clear;
2099
2100	$_->clear_links_to ($self) for values %cf::MAP;
2101		2249
2102	$self->unlink_save;	2250	$self->unlink_save;
2103	$self->destroy;	2251	$self->destroy;
2104	}	2252	}
2105		2253
2106	my $nuke_counter = "aaaa";	2254	my $nuke_counter = "aaaa";
2107		2255
2108	sub nuke {	2256	sub nuke {
2109	my ($self) = @_;	2257	my ($self) = @_;
2110		2258
		2259	{
		2260	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2261
2111	delete $cf::MAP{$self->path};	2262	delete $cf::MAP{$self->path};
2112		2263
2113	$self->unlink_save;	2264	$self->unlink_save;
2114		2265
2115	bless $self, "cf::map";	2266	bless $self, "cf::map";
2116	delete $self->{deny_reset};	2267	delete $self->{deny_reset};
2117	$self->{deny_save} = 1;	2268	$self->{deny_save} = 1;
2118	$self->reset_timeout (1);	2269	$self->reset_timeout (1);
2119	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2270	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120		2271
2121	$cf::MAP{$self->path} = $self;	2272	$cf::MAP{$self->path} = $self;
		2273	}
2122		2274
2123	$self->reset; # polite request, might not happen	2275	$self->reset; # polite request, might not happen
2124	}	2276	}
2125		2277
2126	=item $maps = cf::map::tmp_maps	2278	=item $maps = cf::map::tmp_maps
…		…
2202		2354
2203	sub inv_recursive {	2355	sub inv_recursive {
2204	inv_recursive_ inv $_[0]	2356	inv_recursive_ inv $_[0]
2205	}	2357	}
2206		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
2207	package cf;	2387	package cf;
2208		2388
2209	=back	2389	=back
2210		2390
2211	=head3 cf::object::player	2391	=head3 cf::object::player
…		…
2243	$self->message ($msg, $flags);	2423	$self->message ($msg, $flags);
2244	}	2424	}
2245	}	2425	}
2246	}	2426	}
2247		2427
		2428	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2429
		2430	=cut
		2431
		2432	sub cf::object::send_msg {
		2433	my $pl = shift->contr
		2434	or return;
		2435	$pl->send_msg (@_);
		2436	}
		2437
2248	=item $player_object->may ("access")	2438	=item $player_object->may ("access")
2249		2439
2250	Returns wether the given player is authorized to access resource "access"	2440	Returns wether the given player is authorized to access resource "access"
2251	(e.g. "command_wizcast").	2441	(e.g. "command_wizcast").
2252		2442
…		…
2329	# use -1 or undef as default coordinates, not 0, 0	2519	# use -1 or undef as default coordinates, not 0, 0
2330	($x, $y) = ($map->enter_x, $map->enter_y)	2520	($x, $y) = ($map->enter_x, $map->enter_y)
2331	if $x <=0 && $y <= 0;	2521	if $x <=0 && $y <= 0;
2332		2522
2333	$map->load;	2523	$map->load;
2334	$map->load_diag;	2524	$map->load_neighbours;
2335		2525
2336	return unless $self->contr->active;	2526	return unless $self->contr->active;
2337	$self->activate_recursive;	2527	$self->activate_recursive;
2338		2528
2339	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2529	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2359	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2549	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360		2550
2361	$self->enter_link;	2551	$self->enter_link;
2362		2552
2363	(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
2364	my $map = eval {	2575	my $map = eval {
2365	my $map = cf::map::find $path;	2576	my $map = defined $path ? cf::map::find $path : undef;
2366		2577
2367	if ($map) {	2578	if ($map) {
2368	$map = $map->customise_for ($self);	2579	$map = $map->customise_for ($self);
2369	$map = $check->($map) if $check && $map;	2580	$map = $check->($map) if $check && $map;
2370	} else {	2581	} else {
2371	$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);
2372	}	2583	}
2373		2584
2374	$map	2585	$map
2375	};	2586	};
2376		2587
…		…
2429	$rmp->{origin_y} = $exit->y;	2640	$rmp->{origin_y} = $exit->y;
2430	}	2641	}
2431		2642
2432	$rmp->{random_seed} ||= $exit->random_seed;	2643	$rmp->{random_seed} ||= $exit->random_seed;
2433		2644
2434	my $data = cf::to_json $rmp;	2645	my $data = cf::encode_json $rmp;
2435	my $md5 = Digest::MD5::md5_hex $data;	2646	my $md5 = Digest::MD5::md5_hex $data;
2436	my $meta = "$RANDOMDIR/$md5.meta";	2647	my $meta = "$RANDOMDIR/$md5.meta";
2437		2648
2438	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2649	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439	aio_write $fh, 0, (length $data), $data, 0;	2650	aio_write $fh, 0, (length $data), $data, 0;
…		…
2466	# if exit is damned, update players death & WoR home-position	2677	# if exit is damned, update players death & WoR home-position
2467	$self->contr->savebed ($slaying, $hp, $sp)	2678	$self->contr->savebed ($slaying, $hp, $sp)
2468	if $exit->flag (FLAG_DAMNED);	2679	if $exit->flag (FLAG_DAMNED);
2469		2680
2470	(async {	2681	(async {
		2682	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2683
2471	$self->deactivate_recursive; # just to be sure	2684	$self->deactivate_recursive; # just to be sure
2472	unless (eval {	2685	unless (eval {
2473	$self->goto ($slaying, $hp, $sp);	2686	$self->goto ($slaying, $hp, $sp);
2474		2687
2475	1;	2688	1;
…		…
2510	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
2511	the message unless the client supports the msg packet.	2724	the message unless the client supports the msg packet.
2512		2725
2513	=cut	2726	=cut
2514		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
2515	sub cf::client::send_msg {	2780	sub cf::client::send_msg {
2516	my ($self, $channel, $msg, $color, @extra) = @_;	2781	my ($self, $channel, $msg, $color, @extra) = @_;
2517		2782
2518	$msg = $self->pl->expand_cfpod ($msg);	2783	$msg = $self->pl->expand_cfpod ($msg);
2519		2784
2520	$color &= cf::NDI_CLIENT_MASK; # just in case...	2785	$color &= cf::NDI_CLIENT_MASK; # just in case...
2521		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
2522	if (ref $channel) {	2796	} elsif (ref $channel) {
2523	# send meta info to client, if not yet sent	2797	# send meta info to client, if not yet sent
2524	unless (exists $self->{channel}{$channel->{id}}) {	2798	unless (exists $self->{channel}{$channel->{id}}) {
2525	$self->{channel}{$channel->{id}} = $channel;	2799	$self->{channel}{$channel->{id}} = $channel;
2526	$self->ext_msg (channel_info => $channel);	2800	$self->ext_msg (channel_info => $channel)
		2801	if $self->can_msg;
2527	}	2802	}
2528		2803
2529	$channel = $channel->{id};	2804	$channel = $channel->{id};
2530	}	2805	}
2531		2806
…		…
2550	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;	2825	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551	}	2826	}
2552		2827
2553	$color &= cf::NDI_COLOR_MASK;	2828	$color &= cf::NDI_COLOR_MASK;
2554		2829
		2830	utf8::encode $msg;
		2831
2555	if (0 && $msg =~ /\[/) {	2832	if (0 && $msg =~ /\[/) {
		2833	# COMMAND/INFO
2556	$self->send_packet ("drawextinfo $color 4 0 $msg")	2834	$self->send_packet ("drawextinfo $color 10 8 $msg")
2557	} else {	2835	} else {
2558	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2836	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559	$self->send_packet ("drawinfo $color $msg")	2837	$self->send_packet ("drawinfo $color $msg")
2560	}	2838	}
2561	}	2839	}
…		…
2569	=cut	2847	=cut
2570		2848
2571	sub cf::client::ext_msg($$@) {	2849	sub cf::client::ext_msg($$@) {
2572	my ($self, $type, @msg) = @_;	2850	my ($self, $type, @msg) = @_;
2573		2851
2574	my $extcmd = $self->extcmd;
2575
2576	if ($extcmd == 2) {	2852	if ($self->extcmd == 2) {
2577	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	2853	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578	} elsif ($extcmd == 1) { # TODO: remove	2854	} elsif ($self->extcmd == 1) { # TODO: remove
2579	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;
2580	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2874	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581	}	2875	}
2582	}	2876	}
2583		2877
2584	=item $success = $client->query ($flags, "text", \&cb)	2878	=item $success = $client->query ($flags, "text", \&cb)
…		…
2646	my ($type, $reply, @payload) =	2940	my ($type, $reply, @payload) =
2647	"ARRAY" eq ref $msg	2941	"ARRAY" eq ref $msg
2648	? @$msg	2942	? @$msg
2649	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	2943	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650		2944
		2945	my @reply;
		2946
2651	if (my $cb = $EXTICMD{$type}) {	2947	if (my $cb = $EXTICMD{$type}) {
2652	my @reply = $cb->($ns, @payload);	2948	@reply = $cb->($ns, @payload);
2653
2654	$ns->ext_reply ($reply, @reply)
2655	if $reply;
2656	}	2949	}
		2950
		2951	$ns->ext_reply ($reply, @reply)
		2952	if $reply;
		2953
2657	} else {	2954	} else {
2658	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";
2659	}	2956	}
2660		2957
2661	cf::override;	2958	cf::override;
…		…
2708	our $safe = new Safe "safe";	3005	our $safe = new Safe "safe";
2709	our $safe_hole = new Safe::Hole;	3006	our $safe_hole = new Safe::Hole;
2710		3007
2711	$SIG{FPE} = 'IGNORE';	3008	$SIG{FPE} = 'IGNORE';
2712		3009
2713	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	3010	$safe->permit_only (Opcode::opset qw(
		3011	:base_core :base_mem :base_orig :base_math
		3012	grepstart grepwhile mapstart mapwhile
		3013	sort time
		3014	));
2714		3015
2715	# here we export the classes and methods available to script code	3016	# here we export the classes and methods available to script code
2716		3017
2717	=pod	3018	=pod
2718		3019
2719	The following functions and methods are available within a safe environment:	3020	The following functions and methods are available within a safe environment:
2720		3021
2721	cf::object	3022	cf::object
2722	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
2723	insert remove	3024	insert remove name archname title slaying race decrease_ob_nr
2724		3025
2725	cf::object::player	3026	cf::object::player
2726	player	3027	player
2727		3028
2728	cf::player	3029	cf::player
…		…
2733		3034
2734	=cut	3035	=cut
2735		3036
2736	for (	3037	for (
2737	["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
		3039	insert remove inv name archname title slaying race
2738	insert remove)],	3040	decrease_ob_nr destroy)],
2739	["cf::object::player" => qw(player)],	3041	["cf::object::player" => qw(player)],
2740	["cf::player" => qw(peaceful)],	3042	["cf::player" => qw(peaceful)],
2741	["cf::map" => qw(trigger)],	3043	["cf::map" => qw(trigger)],
2742	) {	3044	) {
2743	no strict 'refs';	3045	no strict 'refs';
…		…
2819	# the server's init and main functions	3121	# the server's init and main functions
2820		3122
2821	sub load_facedata($) {	3123	sub load_facedata($) {
2822	my ($path) = @_;	3124	my ($path) = @_;
2823		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
2824	warn "loading facedata from $path\n";	3132	warn "loading facedata from $path\n";
2825		3133
2826	my $facedata;	3134	my $facedata;
2827	0 < aio_load $path, $facedata	3135	0 < aio_load $path, $facedata
2828	or die "$path: $!";	3136	or die "$path: $!";
…		…
2830	$facedata = Coro::Storable::thaw $facedata;	3138	$facedata = Coro::Storable::thaw $facedata;
2831		3139
2832	$facedata->{version} == 2	3140	$facedata->{version} == 2
2833	or cf::cleanup "$path: version mismatch, cannot proceed.";	3141	or cf::cleanup "$path: version mismatch, cannot proceed.";
2834		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
2835	{	3150	{
2836	my $faces = $facedata->{faceinfo};	3151	my $faces = $facedata->{faceinfo};
2837		3152
2838	while (my ($face, $info) = each %$faces) {	3153	while (my ($face, $info) = each %$faces) {
2839	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3154	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3155
2840	cf::face::set_visibility $idx, $info->{visibility};	3156	cf::face::set_visibility $idx, $info->{visibility};
2841	cf::face::set_magicmap $idx, $info->{magicmap};	3157	cf::face::set_magicmap $idx, $info->{magicmap};
2842	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3158	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3159	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844		3160
2845	cf::cede_to_tick;	3161	cf::cede_to_tick;
2846	}	3162	}
2847		3163
2848	while (my ($face, $info) = each %$faces) {	3164	while (my ($face, $info) = each %$faces) {
2849	next unless $info->{smooth};	3165	next unless $info->{smooth};
		3166
2850	my $idx = cf::face::find $face	3167	my $idx = cf::face::find $face
2851	or next;	3168	or next;
		3169
2852	if (my $smooth = cf::face::find $info->{smooth}) {	3170	if (my $smooth = cf::face::find $info->{smooth}) {
2853	cf::face::set_smooth $idx, $smooth;	3171	cf::face::set_smooth $idx, $smooth;
2854	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3172	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2855	} else {	3173	} else {
2856	warn "smooth face '$info->{smooth}' not found for face '$face'";	3174	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
2873		3191
2874	{	3192	{
2875	# TODO: for gcfclient pleasure, we should give resources	3193	# TODO: for gcfclient pleasure, we should give resources
2876	# that gcfclient doesn't grok a >10000 face index.	3194	# that gcfclient doesn't grok a >10000 face index.
2877	my $res = $facedata->{resource};	3195	my $res = $facedata->{resource};
2878	my $enc = JSON::XS->new->utf8->canonical;
2879
2880	my $soundconf = delete $res->{"res/sound.conf"};
2881		3196
2882	while (my ($name, $info) = each %$res) {	3197	while (my ($name, $info) = each %$res) {
2883	my $meta = $enc->encode ({	3198	if (defined $info->{type}) {
2884	name => $name,
2885	%{ $info->{meta} || {} },
2886	});
2887
2888	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3199	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3200	my $data;
2889		3201
2890	if ($info->{type} & 1) {	3202	if ($info->{type} & 1) {
2891	# prepend meta info	3203	# prepend meta info
2892		3204
		3205	my $meta = $enc->encode ({
		3206	name => $name,
		3207	%{ $info->{meta} || {} },
		3208	});
		3209
2893	my $data = pack "(w/a*)*", $meta, $info->{data};	3210	$data = pack "(w/a*)*", $meta, $info->{data};
2894	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata	3211	} else {
		3212	$data = $info->{data};
		3213	}
2895		3214
2896	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};
2897	} else {	3217	} else {
2898	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};	3218	$RESOURCE{$name} = $info;
2899	}	3219	}
2900		3220
2901	cf::face::set_type $idx, $info->{type};
2902
2903	cf::cede_to_tick;	3221	cf::cede_to_tick;
2904	}	3222	}
2905		3223
2906	if ($soundconf) {	3224	if (my $soundconf = delete $res->{"res/sound.conf"}) {
2907	$soundconf = $enc->decode (delete $soundconf->{data});	3225	$soundconf = $enc->decode (delete $soundconf->{data});
2908		3226
2909	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3227	for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910	my $sound = $soundconf->{compat}[$_]	3228	my $sound = $soundconf->{compat}[$_]
2911	or next;	3229	or next;
2912		3230
2913	my $face = cf::face::find "sound/$sound->[1]";	3231	my $face = cf::face::find "sound/$sound->[1]";
2914
2915	cf::sound::set $sound->[0] => $face;	3232	cf::sound::set $sound->[0] => $face;
2916	cf::sound::old_sound_index $_, $face; # gcfclient-compat	3233	cf::sound::old_sound_index $_, $face; # gcfclient-compat
2917	}	3234	}
2918		3235
		3236	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3237	my $face = cf::face::find "sound/$v";
		3238	cf::sound::set $k => $face;
2919	#TODO	3239	}
2920	}	3240	}
2921	}	3241	}
2922		3242
2923	1	3243	1
2924	}	3244	}
…		…
2930	$ns->fx_want ($k, $v);	3250	$ns->fx_want ($k, $v);
2931	}	3251	}
2932	};	3252	};
2933		3253
2934	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
2935	load_resource_file "$MAPDIR/regions"	3259	load_resource_file "$MAPDIR/regions"
2936	or die "unable to load regions file\n";	3260	or die "unable to load regions file\n";
2937		3261
2938	for (cf::region::list) {	3262	for (cf::region::list) {
2939	$_->{match} = qr/$_->{match}/	3263	$_->{match} = qr/$_->{match}/
…		…
2975		3299
2976	sub init {	3300	sub init {
2977	reload_resources;	3301	reload_resources;
2978	}	3302	}
2979		3303
2980	sub cfg_load {	3304	sub reload_config {
2981	open my $fh, "<:utf8", "$CONFDIR/config"	3305	open my $fh, "<:utf8", "$CONFDIR/config"
2982	or return;	3306	or return;
2983		3307
2984	local $/;	3308	local $/;
2985	*CFG = YAML::Syck::Load <$fh>;	3309	*CFG = YAML::Syck::Load <$fh>;
…		…
3001	sub main {	3325	sub main {
3002	# we must not ever block the main coroutine	3326	# we must not ever block the main coroutine
3003	local $Coro::idle = sub {	3327	local $Coro::idle = sub {
3004	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#
3005	(async {	3329	(async {
3006	Event::one_event;	3330	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3331	EV::loop EV::LOOP_ONESHOT;
3007	})->prio (Coro::PRIO_MAX);	3332	})->prio (Coro::PRIO_MAX);
3008	};	3333	};
3009		3334
3010	cfg_load;	3335	reload_config;
3011	db_init;	3336	db_init;
3012	load_extensions;	3337	load_extensions;
3013		3338
3014	$TICK_WATCHER->start;	3339	$TICK_WATCHER->start;
		3340	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3015	Event::loop;	3341	EV::loop;
3016	}	3342	}
3017		3343
3018	#############################################################################	3344	#############################################################################
3019	# initialisation and cleanup	3345	# initialisation and cleanup
3020		3346
3021	# install some emergency cleanup handlers	3347	# install some emergency cleanup handlers
3022	BEGIN {	3348	BEGIN {
		3349	our %SIGWATCHER = ();
3023	for my $signal (qw(INT HUP TERM)) {	3350	for my $signal (qw(INT HUP TERM)) {
3024	Event->signal (	3351	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3025	reentrant => 0,
3026	data => WF_AUTOCANCEL,
3027	signal => $signal,
3028	prio => 0,
3029	cb => sub {
3030	cf::cleanup "SIG$signal";	3352	cf::cleanup "SIG$signal";
3031	},
3032	);	3353	};
3033	}	3354	}
3034	}	3355	}
3035		3356
3036	sub write_runtime {	3357	sub write_runtime {
3037	my $runtime = "$LOCALDIR/runtime";	3358	my $runtime = "$LOCALDIR/runtime";
…		…
3082	# and maps saved/destroyed asynchronously.	3403	# and maps saved/destroyed asynchronously.
3083	warn "begin emergency player save\n";	3404	warn "begin emergency player save\n";
3084	for my $login (keys %cf::PLAYER) {	3405	for my $login (keys %cf::PLAYER) {
3085	my $pl = $cf::PLAYER{$login} or next;	3406	my $pl = $cf::PLAYER{$login} or next;
3086	$pl->valid or next;	3407	$pl->valid or next;
		3408	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3087	$pl->save;	3409	$pl->save;
3088	}	3410	}
3089	warn "end emergency player save\n";	3411	warn "end emergency player save\n";
3090		3412
3091	warn "begin emergency map save\n";	3413	warn "begin emergency map save\n";
…		…
3130	warn "syncing database to disk";	3452	warn "syncing database to disk";
3131	BDB::db_env_txn_checkpoint $DB_ENV;	3453	BDB::db_env_txn_checkpoint $DB_ENV;
3132		3454
3133	# 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
3134		3456
3135	warn "cancelling all WF_AUTOCANCEL watchers";
3136	for (Event::all_watchers) {
3137	$_->cancel if $_->data & WF_AUTOCANCEL;
3138	}
3139
3140	warn "flushing outstanding aio requests";	3457	warn "flushing outstanding aio requests";
3141	for (;;) {	3458	for (;;) {
3142	BDB::flush;	3459	BDB::flush;
3143	IO::AIO::flush;	3460	IO::AIO::flush;
3144	Coro::cede;	3461	Coro::cede_notself;
3145	last unless IO::AIO::nreqs || BDB::nreqs;	3462	last unless IO::AIO::nreqs || BDB::nreqs;
3146	warn "iterate...";	3463	warn "iterate...";
3147	}	3464	}
3148		3465
3149	++$RELOAD;	3466	++$RELOAD;
…		…
3208	warn "reloading cf.pm";	3525	warn "reloading cf.pm";
3209	require cf;	3526	require cf;
3210	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3527	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3211		3528
3212	warn "loading config and database again";	3529	warn "loading config and database again";
3213	cf::cfg_load;	3530	cf::reload_config;
3214		3531
3215	warn "loading extensions";	3532	warn "loading extensions";
3216	cf::load_extensions;	3533	cf::load_extensions;
3217		3534
3218	warn "reattaching attachments to objects/players";	3535	warn "reattaching attachments to objects/players";
…		…
3238		3555
3239	sub reload_perl() {	3556	sub reload_perl() {
3240	# doing reload synchronously and two reloads happen back-to-back,	3557	# doing reload synchronously and two reloads happen back-to-back,
3241	# coro crashes during coro_state_free->destroy here.	3558	# coro crashes during coro_state_free->destroy here.
3242		3559
3243	$RELOAD_WATCHER ||= Event->timer (	3560	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3244	reentrant => 0,
3245	after => 0,
3246	data => WF_AUTOCANCEL,
3247	cb => sub {
3248	do_reload_perl;
3249	undef $RELOAD_WATCHER;	3561	undef $RELOAD_WATCHER;
3250	},	3562	do_reload_perl;
3251	);	3563	};
3252	}	3564	}
3253		3565
3254	register_command "reload" => sub {	3566	register_command "reload" => sub {
3255	my ($who, $arg) = @_;	3567	my ($who, $arg) = @_;
3256		3568
3257	if ($who->flag (FLAG_WIZ)) {	3569	if ($who->flag (FLAG_WIZ)) {
3258	$who->message ("reloading server.");	3570	$who->message ("reloading server.");
		3571	async {
		3572	$Coro::current->{desc} = "perl_reload";
3259	async { reload_perl };	3573	reload_perl;
		3574	};
3260	}	3575	}
3261	};	3576	};
3262		3577
3263	unshift @INC, $LIBDIR;	3578	unshift @INC, $LIBDIR;
3264		3579
…		…
3283	my $signal = new Coro::Signal;	3598	my $signal = new Coro::Signal;
3284	push @WAIT_FOR_TICK_BEGIN, $signal;	3599	push @WAIT_FOR_TICK_BEGIN, $signal;
3285	$signal->wait;	3600	$signal->wait;
3286	}	3601	}
3287		3602
3288	my $min = 1e6;#d#	3603	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3289	my $avg = 10;
3290	$TICK_WATCHER = Event->timer (
3291	reentrant => 0,
3292	parked => 1,
3293	prio => 0,
3294	at => $NEXT_TICK || $TICK,
3295	data => WF_AUTOCANCEL,
3296	cb => sub {
3297	if ($Coro::current != $Coro::main) {	3604	if ($Coro::current != $Coro::main) {
3298	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"
3299	unless ++$bug_warning > 10;	3606	unless ++$bug_warning > 10;
3300	return;	3607	return;
3301	}	3608	}
3302		3609
3303	$NOW = $tick_start = Event::time;	3610	$NOW = $tick_start = EV::now;
3304		3611
3305	cf::server_tick; # one server iteration	3612	cf::server_tick; # one server iteration
3306		3613
3307	0 && sync_job {#d#	3614	$RUNTIME += $TICK;
3308	for(1..10) {	3615	$NEXT_TICK = $_[0]->at;
3309	my $t = Event::time;
3310	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3311	or die;
3312		3616
3313	$map->width (50);	3617	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3314	$map->height (50);	3618	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3315	$map->alloc;	3619	Coro::async_pool {
3316	$map->_load_objects ("/tmp/x.map", 1);	3620	$Coro::current->{desc} = "runtime saver";
3317	my $t = Event::time - $t;	3621	write_runtime
3318		3622	or warn "ERROR: unable to write runtime file: $!";
3319	#next unless $t < 0.0013;#d#
3320	if ($t < $min) {
3321	$min = $t;
3322	}
3323	$avg = $avg * 0.99 + $t * 0.01;
3324	}
3325	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3326	exit 0;
3327	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3328	};	3623	};
		3624	}
3329		3625
3330	$RUNTIME += $TICK;
3331	$NEXT_TICK += $TICK;
3332
3333	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3334	$NEXT_RUNTIME_WRITE = $NOW + 10;
3335	Coro::async_pool {
3336	write_runtime
3337	or warn "ERROR: unable to write runtime file: $!";
3338	};
3339	}
3340
3341	# my $AFTER = Event::time;
3342	# warn $AFTER - $NOW;#d#
3343
3344	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3626	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3345	$sig->send;	3627	$sig->send;
3346	}	3628	}
3347	while (my $sig = shift @WAIT_FOR_TICK) {	3629	while (my $sig = shift @WAIT_FOR_TICK) {
3348	$sig->send;	3630	$sig->send;
3349	}	3631	}
3350		3632
3351	$NOW = Event::time;
3352
3353	# if we are delayed by four ticks or more, skip them all
3354	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3355
3356	$TICK_WATCHER->at ($NEXT_TICK);
3357	$TICK_WATCHER->start;
3358
3359	$LOAD = ($NOW - $tick_start) / $TICK;	3633	$LOAD = ($NOW - $tick_start) / $TICK;
3360	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3634	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3361		3635
3362	_post_tick;	3636	_post_tick;
3363		3637	};
3364		3638	$TICK_WATCHER->priority (EV::MAXPRI);
3365	},
3366	);
3367		3639
3368	{	3640	{
3369	BDB::max_poll_time $TICK * 0.1;	3641	# configure BDB
3370	$BDB_POLL_WATCHER = Event->io (	3642
3371	reentrant => 0,
3372	fd => BDB::poll_fileno,
3373	poll => 'r',
3374	prio => 0,
3375	data => WF_AUTOCANCEL,
3376	cb => \&BDB::poll_cb,
3377	);
3378	BDB::min_parallel 8;	3643	BDB::min_parallel 8;
3379		3644	BDB::max_poll_reqs $TICK * 0.1;
3380	BDB::set_sync_prepare {	3645	$Coro::BDB::WATCHER->priority (1);
3381	my $status;
3382	my $current = $Coro::current;
3383	(
3384	sub {
3385	$status = $!;
3386	$current->ready; undef $current;
3387	},
3388	sub {
3389	Coro::schedule while defined $current;
3390	$! = $status;
3391	},
3392	)
3393	};
3394		3646
3395	unless ($DB_ENV) {	3647	unless ($DB_ENV) {
3396	$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);
3397		3653
3398	cf::sync_job {	3654	cf::sync_job {
3399	eval {	3655	eval {
3400	BDB::db_env_open	3656	BDB::db_env_open
3401	$DB_ENV,	3657	$DB_ENV,
…		…
3403	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
3404	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3660	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3405	0666;	3661	0666;
3406		3662
3407	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3663	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3408
3409	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3410	$DB_ENV->set_lk_detect;
3411	};	3664	};
3412		3665
3413	cf::cleanup "db_env_open(db): $@" if $@;	3666	cf::cleanup "db_env_open(db): $@" if $@;
3414	};	3667	};
3415	}	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	};
3416	}	3679	}
3417		3680
3418	{	3681	{
		3682	# configure IO::AIO
		3683
3419	IO::AIO::min_parallel 8;	3684	IO::AIO::min_parallel 8;
3420
3421	undef $Coro::AIO::WATCHER;
3422	IO::AIO::max_poll_time $TICK * 0.1;	3685	IO::AIO::max_poll_time $TICK * 0.1;
3423	$AIO_POLL_WATCHER = Event->io (	3686	$Coro::AIO::WATCHER->priority (1);
3424	reentrant => 0,
3425	data => WF_AUTOCANCEL,
3426	fd => IO::AIO::poll_fileno,
3427	poll => 'r',
3428	prio => 6,
3429	cb => \&IO::AIO::poll_cb,
3430	);
3431	}	3687	}
3432		3688
3433	my $_log_backtrace;	3689	my $_log_backtrace;
3434		3690
3435	sub _log_backtrace {	3691	sub _log_backtrace {
…		…
3439		3695
3440	# limit the # of concurrent backtraces	3696	# limit the # of concurrent backtraces
3441	if ($_log_backtrace < 2) {	3697	if ($_log_backtrace < 2) {
3442	++$_log_backtrace;	3698	++$_log_backtrace;
3443	async {	3699	async {
		3700	$Coro::current->{desc} = "abt $msg";
		3701
3444	my @bt = fork_call {	3702	my @bt = fork_call {
3445	@addr = map { sprintf "%x", $_ } @addr;	3703	@addr = map { sprintf "%x", $_ } @addr;
3446	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3704	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3447	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 |"
3448	or die "addr2line: $!";	3706	or die "addr2line: $!";

Diff Legend

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