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.328 by root, Wed Aug 8 06:24:30 2007 UTC vs.
Revision 1.407 by root, Sun Jan 13 09:53:53 2008 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	}
		198
		199	$Coro::State::DIEHOOK = sub {
		200	warn Carp::longmess $_[0];
		201	Coro::terminate;
		202	};
195		203
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	204	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	205	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	206	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	207	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
212	)) {	220	)) {
213	no strict 'refs';	221	no strict 'refs';
214	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	222	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215	}	223	}
216		224
217	$Event::DIED = sub {	225	$EV::DIED = sub {
218	warn "error in event callback: @_";	226	warn "error in event callback: @_";
219	};	227	};
220		228
221	#############################################################################	229	#############################################################################
222		230
…		…
245	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	253	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246	$d	254	$d
247	} || "[unable to dump $_[0]: '$@']";	255	} || "[unable to dump $_[0]: '$@']";
248	}	256	}
249		257
250	=item $ref = cf::from_json $json	258	=item $ref = cf::decode_json $json
251		259
252	Converts a JSON string into the corresponding perl data structure.	260	Converts a JSON string into the corresponding perl data structure.
253		261
254	=item $json = cf::to_json $ref	262	=item $json = cf::encode_json $ref
255		263
256	Converts a perl data structure into its JSON representation.	264	Converts a perl data structure into its JSON representation.
257		265
258	=cut	266	=cut
259		267
260	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	268	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261		269
262	sub to_json ($) { $json_coder->encode ($_[0]) }	270	sub encode_json($) { $json_coder->encode ($_[0]) }
263	sub from_json ($) { $json_coder->decode ($_[0]) }	271	sub decode_json($) { $json_coder->decode ($_[0]) }
264		272
265	=item cf::lock_wait $string	273	=item cf::lock_wait $string
266		274
267	Wait until the given lock is available. See cf::lock_acquire.	275	Wait until the given lock is available. See cf::lock_acquire.
268		276
…		…
271	Wait until the given lock is available and then acquires it and returns	279	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,	280	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	281	for example when the coroutine gets canceled), the lock is automatically
274	returned.	282	returned.
275		283
		284	Locks are *not* recursive, locking from the same coro twice results in a
		285	deadlocked coro.
		286
276	Lock names should begin with a unique identifier (for example, cf::map::find	287	Lock names should begin with a unique identifier (for example, cf::map::find
277	uses map_find and cf::map::load uses map_load).	288	uses map_find and cf::map::load uses map_load).
278		289
279	=item $locked = cf::lock_active $string	290	=item $locked = cf::lock_active $string
280		291
281	Return true if the lock is currently active, i.e. somebody has locked it.	292	Return true if the lock is currently active, i.e. somebody has locked it.
282		293
283	=cut	294	=cut
284		295
285	our %LOCK;	296	our %LOCK;
		297	our %LOCKER;#d#
286		298
287	sub lock_wait($) {	299	sub lock_wait($) {
288	my ($key) = @_;	300	my ($key) = @_;
		301
		302	if ($LOCKER{$key} == $Coro::current) {#d#
		303	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		304	return;#d#
		305	}#d#
289		306
290	# wait for lock, if any	307	# wait for lock, if any
291	while ($LOCK{$key}) {	308	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;	309	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;	310	Coro::schedule;
…		…
299		316
300	# wait, to be sure we are not locked	317	# wait, to be sure we are not locked
301	lock_wait $key;	318	lock_wait $key;
302		319
303	$LOCK{$key} = [];	320	$LOCK{$key} = [];
		321	$LOCKER{$key} = $Coro::current;#d#
304		322
305	Coro::guard {	323	Coro::guard {
		324	delete $LOCKER{$key};#d#
306	# wake up all waiters, to be on the safe side	325	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };	326	$_->ready for @{ delete $LOCK{$key} };
308	}	327	}
309	}	328	}
310		329
…		…
322	};	341	};
323	$TICK_WATCHER->stop;	342	$TICK_WATCHER->stop;
324	$guard	343	$guard
325	}	344	}
326		345
		346	=item cf::periodic $interval, $cb
		347
		348	Like EV::periodic, but randomly selects a starting point so that the actions
		349	get spread over timer.
		350
		351	=cut
		352
		353	sub periodic($$) {
		354	my ($interval, $cb) = @_;
		355
		356	my $start = rand List::Util::min 180, $interval;
		357
		358	EV::periodic $start, $interval, 0, $cb
		359	}
		360
327	=item cf::get_slot $time[, $priority[, $name]]	361	=item cf::get_slot $time[, $priority[, $name]]
328		362
329	Allocate $time seconds of blocking CPU time at priority C<$priority>:	363	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	364	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.	365	of cpu time till the next tick. The slot is only valid till the next cede.
…		…
340	our @SLOT_QUEUE;	374	our @SLOT_QUEUE;
341	our $SLOT_QUEUE;	375	our $SLOT_QUEUE;
342		376
343	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	377	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344	$SLOT_QUEUE = Coro::async {	378	$SLOT_QUEUE = Coro::async {
		379	$Coro::current->desc ("timeslot manager");
		380
345	my $signal = new Coro::Signal;	381	my $signal = new Coro::Signal;
346		382
347	while () {	383	while () {
348	next_job:	384	next_job:
349	my $avail = cf::till_tick;	385	my $avail = cf::till_tick;
…		…
357	}	393	}
358	}	394	}
359	}	395	}
360		396
361	if (@SLOT_QUEUE) {	397	if (@SLOT_QUEUE) {
362	# we do not use wait_For_tick() as it returns immediately when tick is inactive	398	# we do not use wait_for_tick() as it returns immediately when tick is inactive
363	push @cf::WAIT_FOR_TICK, $signal;	399	push @cf::WAIT_FOR_TICK, $signal;
364	$signal->wait;	400	$signal->wait;
365	} else {	401	} else {
366	Coro::schedule;	402	Coro::schedule;
367	}	403	}
…		…
390		426
391	BEGIN { *async = \&Coro::async_pool }	427	BEGIN { *async = \&Coro::async_pool }
392		428
393	=item cf::sync_job { BLOCK }	429	=item cf::sync_job { BLOCK }
394		430
395	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	431	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	432	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	433	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398	acceptable.	434	acceptable.
399		435
400	If it must be done, put the blocking parts into C<sync_job>. This will run	436	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	437	the given BLOCK in another coroutine while waiting for the result. The
…		…
406		442
407	sub sync_job(&) {	443	sub sync_job(&) {
408	my ($job) = @_;	444	my ($job) = @_;
409		445
410	if ($Coro::current == $Coro::main) {	446	if ($Coro::current == $Coro::main) {
411	my $time = Event::time;	447	my $time = EV::time;
412		448
413	# this is the main coro, too bad, we have to block	449	# this is the main coro, too bad, we have to block
414	# till the operation succeeds, freezing the server :/	450	# till the operation succeeds, freezing the server :/
415		451
		452	LOG llevError, Carp::longmess "sync job";#d#
		453
416	# TODO: use suspend/resume instead	454	# TODO: use suspend/resume instead
417	# (but this is cancel-safe)	455	# (but this is cancel-safe)
418	my $freeze_guard = freeze_mainloop;	456	my $freeze_guard = freeze_mainloop;
419		457
420	my $busy = 1;	458	my $busy = 1;
421	my @res;	459	my @res;
422		460
423	(async {	461	(async {
		462	$Coro::current->desc ("sync job coro");
424	@res = eval { $job->() };	463	@res = eval { $job->() };
425	warn $@ if $@;	464	warn $@ if $@;
426	undef $busy;	465	undef $busy;
427	})->prio (Coro::PRIO_MAX);	466	})->prio (Coro::PRIO_MAX);
428		467
429	while ($busy) {	468	while ($busy) {
430	Coro::cede or Event::one_event;	469	if (Coro::nready) {
		470	Coro::cede_notself;
		471	} else {
		472	EV::loop EV::LOOP_ONESHOT;
431	}	473	}
		474	}
432		475
433	$time = Event::time - $time;	476	$time = EV::time - $time;
434		477
435	LOG llevError | logBacktrace, Carp::longmess "long sync job"	478	LOG llevError | logBacktrace, Carp::longmess "long sync job"
436	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	479	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437		480
438	$tick_start += $time; # do not account sync jobs to server load	481	$tick_start += $time; # do not account sync jobs to server load
…		…
468	=item fork_call { }, $args	511	=item fork_call { }, $args
469		512
470	Executes the given code block with the given arguments in a seperate	513	Executes the given code block with the given arguments in a seperate
471	process, returning the results. Everything must be serialisable with	514	process, returning the results. Everything must be serialisable with
472	Coro::Storable. May, of course, block. Note that the executed sub may	515	Coro::Storable. May, of course, block. Note that the executed sub may
473	never block itself or use any form of Event handling.	516	never block itself or use any form of event handling.
474		517
475	=cut	518	=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		519
486	sub fork_call(&@) {	520	sub fork_call(&@) {
487	my ($cb, @args) = @_;	521	my ($cb, @args) = @_;
488		522
489	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	523	# we seemingly have to make a local copy of the whole thing,
490	# or die "socketpair: $!";	524	# otherwise perl prematurely frees the stuff :/
491	pipe my $fh1, my $fh2	525	# TODO: investigate and fix (likely this will be rather laborious)
492	or die "pipe: $!";
493		526
494	if (my $pid = fork) {	527	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;	528	reset_signals;
508	local $SIG{__WARN__};	529	&$cb
509	local $SIG{__DIE__};	530	}, @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		531
516	eval {	532	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	}	533	}
529		534
530	=item $value = cf::db_get $family => $key	535	=item $value = cf::db_get $family => $key
531		536
532	Returns a single value from the environment database.	537	Returns a single value from the environment database.
…		…
534	=item cf::db_put $family => $key => $value	539	=item cf::db_put $family => $key => $value
535		540
536	Stores the given C<$value> in the family. It can currently store binary	541	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).	542	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538		543
		544	=item $db = cf::db_table "name"
		545
		546	Create and/or open a new database table. The string must not be "db" and must be unique
		547	within each server.
		548
539	=cut	549	=cut
		550
		551	sub db_table($) {
		552	my ($name) = @_;
		553	my $db = BDB::db_create $DB_ENV;
		554
		555	eval {
		556	$db->set_flags (BDB::CHKSUM);
		557
		558	utf8::encode $name;
		559	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		560	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		561	cf::cleanup "db_open(db): $!" if $!;
		562	};
		563	cf::cleanup "db_open(db): $@" if $@;
		564
		565	$db
		566	}
540		567
541	our $DB;	568	our $DB;
542		569
543	sub db_init {	570	sub db_init {
544	unless ($DB) {
545	$DB = BDB::db_create $DB_ENV;
546
547	cf::sync_job {	571	cf::sync_job {
548	eval {	572	$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	}	573	};
558	}	574	}
559		575
560	sub db_get($$) {	576	sub db_get($$) {
561	my $key = "$_[0]/$_[1]";	577	my $key = "$_[0]/$_[1]";
562		578
…		…
612	if (1) {	628	if (1) {
613	$md5 =	629	$md5 =
614	join "\x00",	630	join "\x00",
615	$processversion,	631	$processversion,
616	map {	632	map {
617	Coro::cede;	633	cf::cede_to_tick;
618	($src->[$_], Digest::MD5::md5_hex $data[$_])	634	($src->[$_], Digest::MD5::md5_hex $data[$_])
619	} 0.. $#$src;	635	} 0.. $#$src;
620		636
621		637
622	my $dbmd5 = db_get cache => "$id/md5";	638	my $dbmd5 = db_get cache => "$id/md5";
…		…
666	attach callbacks/event handlers (a collection of which is called an "attachment")	682	attach callbacks/event handlers (a collection of which is called an "attachment")
667	to it. All such attachable objects support the following methods.	683	to it. All such attachable objects support the following methods.
668		684
669	In the following description, CLASS can be any of C<global>, C<object>	685	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	686	C<player>, C<client> or C<map> (i.e. the attachable objects in
671	Crossfire TRT).	687	Deliantra).
672		688
673	=over 4	689	=over 4
674		690
675	=item $attachable->attach ($attachment, key => $value...)	691	=item $attachable->attach ($attachment, key => $value...)
676		692
…		…
958	}	974	}
959		975
960	0	976	0
961	}	977	}
962		978
963	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	979	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964		980
965	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	981	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966		982
967	Generate an object-specific event with the given arguments.	983	Generate an object-specific event with the given arguments.
968		984
…		…
974		990
975	=cut	991	=cut
976		992
977	#############################################################################	993	#############################################################################
978	# object support	994	# object support
979	#
980		995
		996	sub _object_equal($$);
		997	sub _object_equal($$) {
		998	my ($a, $b) = @_;
		999
		1000	return 0 unless (ref $a) eq (ref $b);
		1001
		1002	if ("HASH" eq ref $a) {
		1003	my @ka = keys %$a;
		1004	my @kb = keys %$b;
		1005
		1006	return 0 if @ka != @kb;
		1007
		1008	for (0 .. $#ka) {
		1009	return 0 unless $ka[$_] eq $kb[$_];
		1010	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1011	}
		1012
		1013	} elsif ("ARRAY" eq ref $a) {
		1014
		1015	return 0 if @$a != @$b;
		1016
		1017	for (0 .. $#$a) {
		1018	return 0 unless _object_equal $a->[$_], $b->[$_];
		1019	}
		1020
		1021	} elsif ($a ne $b) {
		1022	return 0;
		1023	}
		1024
		1025	1
		1026	}
		1027
		1028	our $SLOW_MERGES;#d#
981	sub _can_merge {	1029	sub _can_merge {
982	my ($ob1, $ob2) = @_;	1030	my ($ob1, $ob2) = @_;
983		1031
984	local $Storable::canonical = 1;	1032	++$SLOW_MERGES;#d#
985	my $fob1 = Storable::freeze $ob1;
986	my $fob2 = Storable::freeze $ob2;
987		1033
988	$fob1 eq $fob2	1034	# we do the slow way here
		1035	return _object_equal $ob1, $ob2
989	}	1036	}
990		1037
991	sub reattach {	1038	sub reattach {
992	# basically do the same as instantiate, without calling instantiate	1039	# basically do the same as instantiate, without calling instantiate
993	my ($obj) = @_;	1040	my ($obj) = @_;
…		…
1015	cf::attachable->attach (	1062	cf::attachable->attach (
1016	prio => -1000000,	1063	prio => -1000000,
1017	on_instantiate => sub {	1064	on_instantiate => sub {
1018	my ($obj, $data) = @_;	1065	my ($obj, $data) = @_;
1019		1066
1020	$data = from_json $data;	1067	$data = decode_json $data;
1021		1068
1022	for (@$data) {	1069	for (@$data) {
1023	my ($name, $args) = @$_;	1070	my ($name, $args) = @$_;
1024		1071
1025	$obj->attach ($name, %{$args || {} });	1072	$obj->attach ($name, %{$args || {} });
…		…
1041	sub object_freezer_save {	1088	sub object_freezer_save {
1042	my ($filename, $rdata, $objs) = @_;	1089	my ($filename, $rdata, $objs) = @_;
1043		1090
1044	sync_job {	1091	sync_job {
1045	if (length $$rdata) {	1092	if (length $$rdata) {
		1093	utf8::decode (my $decname = $filename);
1046	warn sprintf "saving %s (%d,%d)\n",	1094	warn sprintf "saving %s (%d,%d)\n",
1047	$filename, length $$rdata, scalar @$objs;	1095	$decname, length $$rdata, scalar @$objs;
1048		1096
1049	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1097	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050	chmod SAVE_MODE, $fh;	1098	chmod SAVE_MODE, $fh;
1051	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1099	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052	aio_fsync $fh if $cf::USE_FSYNC;	1100	aio_fsync $fh if $cf::USE_FSYNC;
1053	close $fh;	1101	close $fh;
1054		1102
1055	if (@$objs) {	1103	if (@$objs) {
1056	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1104	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057	chmod SAVE_MODE, $fh;	1105	chmod SAVE_MODE, $fh;
1058	my $data = Storable::nfreeze { version => 1, objs => $objs };	1106	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059	aio_write $fh, 0, (length $data), $data, 0;	1107	aio_write $fh, 0, (length $data), $data, 0;
1060	aio_fsync $fh if $cf::USE_FSYNC;	1108	aio_fsync $fh if $cf::USE_FSYNC;
1061	close $fh;	1109	close $fh;
1062	aio_rename "$filename.pst~", "$filename.pst";	1110	aio_rename "$filename.pst~", "$filename.pst";
1063	}	1111	}
…		…
1071	}	1119	}
1072	} else {	1120	} else {
1073	aio_unlink $filename;	1121	aio_unlink $filename;
1074	aio_unlink "$filename.pst";	1122	aio_unlink "$filename.pst";
1075	}	1123	}
1076	}	1124	};
1077	}	1125	}
1078		1126
1079	sub object_freezer_as_string {	1127	sub object_freezer_as_string {
1080	my ($rdata, $objs) = @_;	1128	my ($rdata, $objs) = @_;
1081		1129
…		…
1093	or return;	1141	or return;
1094		1142
1095	unless (aio_stat "$filename.pst") {	1143	unless (aio_stat "$filename.pst") {
1096	(aio_load "$filename.pst", $av) >= 0	1144	(aio_load "$filename.pst", $av) >= 0
1097	or return;	1145	or return;
		1146
1098	$av = eval { (Storable::thaw $av)->{objs} };	1147	my $st = eval { Coro::Storable::thaw $av };
		1148	$av = $st->{objs};
1099	}	1149	}
1100		1150
		1151	utf8::decode (my $decname = $filename);
1101	warn sprintf "loading %s (%d)\n",	1152	warn sprintf "loading %s (%d,%d)\n",
1102	$filename, length $data, scalar @{$av || []};	1153	$decname, length $data, scalar @{$av || []};
		1154
1103	return ($data, $av);	1155	($data, $av)
1104	}	1156	}
1105		1157
1106	=head2 COMMAND CALLBACKS	1158	=head2 COMMAND CALLBACKS
1107		1159
1108	=over 4	1160	=over 4
…		…
1186	my ($type, $reply, @payload) =	1238	my ($type, $reply, @payload) =
1187	"ARRAY" eq ref $msg	1239	"ARRAY" eq ref $msg
1188	? @$msg	1240	? @$msg
1189	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	1241	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190		1242
		1243	my @reply;
		1244
1191	if (my $cb = $EXTCMD{$type}) {	1245	if (my $cb = $EXTCMD{$type}) {
1192	my @reply = $cb->($pl, @payload);	1246	@reply = $cb->($pl, @payload);
1193
1194	$pl->ext_reply ($reply, @reply)
1195	if $reply;
1196	}	1247	}
		1248
		1249	$pl->ext_reply ($reply, @reply)
		1250	if $reply;
		1251
1197	} else {	1252	} else {
1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1253	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199	}	1254	}
1200		1255
1201	cf::override;	1256	cf::override;
…		…
1291		1346
1292	=head3 cf::player	1347	=head3 cf::player
1293		1348
1294	=over 4	1349	=over 4
1295		1350
		1351	=item cf::player::num_playing
		1352
		1353	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1354
		1355	=cut
		1356
		1357	sub num_playing {
		1358	scalar grep
		1359	$_->ob->map
		1360	&& !$_->hidden
		1361	&& !$_->ob->flag (cf::FLAG_WIZ),
		1362	cf::player::list
		1363	}
		1364
1296	=item cf::player::find $login	1365	=item cf::player::find $login
1297		1366
1298	Returns the given player object, loading it if necessary (might block).	1367	Returns the given player object, loading it if necessary (might block).
1299		1368
1300	=cut	1369	=cut
…		…
1335	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1404	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1405	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1406	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338	aio_unlink +(playerdir $login) . "/$login.pl";	1407	aio_unlink +(playerdir $login) . "/$login.pl";
1339		1408
1340	my $pl = load_pl path $login	1409	my $f = new_from_file cf::object::thawer path $login
1341	or return;	1410	or return;
		1411
		1412	my $pl = cf::player::load_pl $f
		1413	or return;
		1414	local $cf::PLAYER_LOADING{$login} = $pl;
		1415	$f->resolve_delayed_derefs;
1342	$cf::PLAYER{$login} = $pl	1416	$cf::PLAYER{$login} = $pl
1343	}	1417	}
1344	}	1418	}
1345	}	1419	}
1346		1420
…		…
1356		1430
1357	aio_mkdir playerdir $pl, 0770;	1431	aio_mkdir playerdir $pl, 0770;
1358	$pl->{last_save} = $cf::RUNTIME;	1432	$pl->{last_save} = $cf::RUNTIME;
1359		1433
1360	$pl->save_pl ($path);	1434	$pl->save_pl ($path);
1361	Coro::cede;	1435	cf::cede_to_tick;
1362	}	1436	}
1363		1437
1364	sub new($) {	1438	sub new($) {
1365	my ($login) = @_;	1439	my ($login) = @_;
1366		1440
…		…
1370	$self->{deny_save} = 1;	1444	$self->{deny_save} = 1;
1371		1445
1372	$cf::PLAYER{$login} = $self;	1446	$cf::PLAYER{$login} = $self;
1373		1447
1374	$self	1448	$self
		1449	}
		1450
		1451	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1452
		1453	=cut
		1454
		1455	sub send_msg {
		1456	my $ns = shift->ns
		1457	or return;
		1458	$ns->send_msg (@_);
1375	}	1459	}
1376		1460
1377	=item $pl->quit_character	1461	=item $pl->quit_character
1378		1462
1379	Nukes the player without looking back. If logged in, the connection will	1463	Nukes the player without looking back. If logged in, the connection will
…		…
1434	or return [];	1518	or return [];
1435		1519
1436	my @logins;	1520	my @logins;
1437		1521
1438	for my $login (@$dirs) {	1522	for my $login (@$dirs) {
		1523	my $path = path $login;
		1524
		1525	# a .pst is a dead give-away for a valid player
		1526	unless (-e "$path.pst") {
1439	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1527	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440	aio_read $fh, 0, 512, my $buf, 0 or next;	1528	aio_read $fh, 0, 512, my $buf, 0 or next;
1441	$buf !~ /^password -------------$/m or next; # official not-valid tag	1529	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1530	}
1442		1531
1443	utf8::decode $login;	1532	utf8::decode $login;
1444	push @logins, $login;	1533	push @logins, $login;
1445	}	1534	}
1446		1535
…		…
1479		1568
1480	Expand crossfire pod fragments into protocol xml.	1569	Expand crossfire pod fragments into protocol xml.
1481		1570
1482	=cut	1571	=cut
1483		1572
		1573	use re 'eval';
		1574
		1575	my $group;
		1576	my $interior; $interior = qr{
		1577	# match a pod interior sequence sans C<< >>
		1578	(?:
		1579	\ (.*?)\ (?{ $group = $^N })
		1580	| < (??{$interior}) >
		1581	)
		1582	}x;
		1583
1484	sub expand_cfpod {	1584	sub expand_cfpod {
1485	((my $self), (local $_)) = @_;	1585	my ($self, $pod) = @_;
1486		1586
1487	# escape & and <	1587	my $xml;
1488	s/&/&amp;/g;
1489	s/(?<![BIUGH])</&lt;/g;
1490		1588
1491	# this is buggy, it needs to properly take care of nested <'s	1589	while () {
		1590	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1591	$group = $1;
1492		1592
1493	1 while	1593	$group =~ s/&/&amp;/g;
1494	# replace B<>, I<>, U<> etc.	1594	$group =~ s/</&lt;/g;
1495	s/B<([^\>]*)>/<b>$1<\/b>/	1595
1496	|| s/I<([^\>]*)>/<i>$1<\/i>/	1596	$xml .= $group;
1497	|| s/U<([^\>]*)>/<u>$1<\/u>/	1597	} elsif ($pod =~ m%\G
1498	# replace G<male|female> tags	1598	([BCGHITU])
1499	|| s{G<([^>|]*)\|([^>]*)>}{	1599	<
1500	$self->gender ? $2 : $1	1600	(?:
1501	}ge	1601	([^<>]*) (?{ $group = $^N })
1502	# replace H<hint text>	1602	| < $interior >
1503	|| s{H<([^\>]*)>}	1603	)
		1604	>
		1605	%gcsx
1504	{	1606	) {
		1607	my ($code, $data) = ($1, $group);
		1608
		1609	if ($code eq "B") {
		1610	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1611	} elsif ($code eq "I") {
		1612	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1613	} elsif ($code eq "U") {
		1614	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1615	} elsif ($code eq "C") {
		1616	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1617	} elsif ($code eq "T") {
		1618	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1619	} elsif ($code eq "G") {
		1620	my ($male, $female) = split /\|/, $data;
		1621	$data = $self->gender ? $female : $male;
		1622	$xml .= expand_cfpod ($self, $data);
		1623	} elsif ($code eq "H") {
1505	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1624	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1625	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507	"")	1626	"")
1508	[$self->{hintmode}]	1627	[$self->{hintmode}];
		1628	} else {
		1629	$xml .= "error processing '$code($data)' directive";
1509	}ge;	1630	}
		1631	} else {
		1632	if ($pod =~ /\G(.+)/) {
		1633	warn "parse error while expanding $pod (at $1)";
		1634	}
		1635	last;
		1636	}
		1637	}
1510		1638
		1639	for ($xml) {
1511	# create single paragraphs (very hackish)	1640	# create single paragraphs (very hackish)
1512	s/(?<=\S)\n(?=\w)/ /g;	1641	s/(?<=\S)\n(?=\w)/ /g;
1513		1642
1514	# compress some whitespace	1643	# compress some whitespace
1515	s/\s+\n/\n/g; # ws line-ends	1644	s/\s+\n/\n/g; # ws line-ends
1516	s/\n\n+/\n/g; # double lines	1645	s/\n\n+/\n/g; # double lines
1517	s/^\n+//; # beginning lines	1646	s/^\n+//; # beginning lines
1518	s/\n+$//; # ending lines	1647	s/\n+$//; # ending lines
		1648	}
1519		1649
1520	$_	1650	$xml
1521	}	1651	}
		1652
		1653	no re 'eval';
1522		1654
1523	sub hintmode {	1655	sub hintmode {
1524	$_[0]{hintmode} = $_[1] if @_ > 1;	1656	$_[0]{hintmode} = $_[1] if @_ > 1;
1525	$_[0]{hintmode}	1657	$_[0]{hintmode}
1526	}	1658	}
…		…
1532	=cut	1664	=cut
1533		1665
1534	sub ext_reply($$@) {	1666	sub ext_reply($$@) {
1535	my ($self, $id, @msg) = @_;	1667	my ($self, $id, @msg) = @_;
1536		1668
1537	if ($self->ns->extcmd == 2) {	1669	$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	}	1670	}
1545		1671
1546	=item $player->ext_msg ($type, @msg)	1672	=item $player->ext_msg ($type, @msg)
1547		1673
1548	Sends an ext event to the client.	1674	Sends an ext event to the client.
…		…
1776		1902
1777	sub load_header_from($) {	1903	sub load_header_from($) {
1778	my ($self, $path) = @_;	1904	my ($self, $path) = @_;
1779		1905
1780	utf8::encode $path;	1906	utf8::encode $path;
1781	#aio_open $path, O_RDONLY, 0	1907	my $f = new_from_file cf::object::thawer $path
1782	# or return;
1783
1784	$self->_load_header ($path)
1785	or return;	1908	or return;
		1909
		1910	$self->_load_header ($f)
		1911	or return;
		1912
		1913	local $MAP_LOADING{$self->{path}} = $self;
		1914	$f->resolve_delayed_derefs;
1786		1915
1787	$self->{load_path} = $path;	1916	$self->{load_path} = $path;
1788		1917
1789	1	1918	1
1790	}	1919	}
…		…
1844	sub find {	1973	sub find {
1845	my ($path, $origin) = @_;	1974	my ($path, $origin) = @_;
1846		1975
1847	$path = normalise $path, $origin && $origin->path;	1976	$path = normalise $path, $origin && $origin->path;
1848		1977
		1978	cf::lock_wait "map_data:$path";#d#remove
1849	cf::lock_wait "map_find:$path";	1979	cf::lock_wait "map_find:$path";
1850		1980
1851	$cf::MAP{$path} || do {	1981	$cf::MAP{$path} || do {
1852	my $guard = cf::lock_acquire "map_find:$path";	1982	my $guard1 = cf::lock_acquire "map_find:$path";
		1983	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1984
1853	my $map = new_from_path cf::map $path	1985	my $map = new_from_path cf::map $path
1854	or return;	1986	or return;
1855		1987
1856	$map->{last_save} = $cf::RUNTIME;	1988	$map->{last_save} = $cf::RUNTIME;
1857		1989
…		…
1859	or return;	1991	or return;
1860		1992
1861	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1993	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862	# doing this can freeze the server in a sync job, obviously	1994	# doing this can freeze the server in a sync job, obviously
1863	#$cf::WAIT_FOR_TICK->wait;	1995	#$cf::WAIT_FOR_TICK->wait;
		1996	undef $guard1;
		1997	undef $guard2;
1864	$map->reset;	1998	$map->reset;
1865	undef $guard;
1866	return find $path;	1999	return find $path;
1867	}	2000	}
1868		2001
1869	$cf::MAP{$path} = $map	2002	$cf::MAP{$path} = $map
1870	}	2003	}
…		…
1879	local $self->{deny_reset} = 1; # loading can take a long time	2012	local $self->{deny_reset} = 1; # loading can take a long time
1880		2013
1881	my $path = $self->{path};	2014	my $path = $self->{path};
1882		2015
1883	{	2016	{
1884	my $guard = cf::lock_acquire "map_load:$path";	2017	my $guard = cf::lock_acquire "map_data:$path";
1885		2018
		2019	return unless $self->valid;
1886	return if $self->in_memory != cf::MAP_SWAPPED;	2020	return unless $self->in_memory == cf::MAP_SWAPPED;
1887		2021
1888	$self->in_memory (cf::MAP_LOADING);	2022	$self->in_memory (cf::MAP_LOADING);
1889		2023
1890	$self->alloc;	2024	$self->alloc;
1891		2025
1892	$self->pre_load;	2026	$self->pre_load;
1893	Coro::cede;	2027	cf::cede_to_tick;
1894		2028
		2029	my $f = new_from_file cf::object::thawer $self->{load_path};
		2030	$f->skip_block;
1895	$self->_load_objects ($self->{load_path}, 1)	2031	$self->_load_objects ($f)
1896	or return;	2032	or return;
1897		2033
1898	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2034	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899	if delete $self->{load_original};	2035	if delete $self->{load_original};
1900		2036
1901	if (my $uniq = $self->uniq_path) {	2037	if (my $uniq = $self->uniq_path) {
1902	utf8::encode $uniq;	2038	utf8::encode $uniq;
1903	if (aio_open $uniq, O_RDONLY, 0) {	2039	unless (aio_stat $uniq) {
		2040	if (my $f = new_from_file cf::object::thawer $uniq) {
1904	$self->clear_unique_items;	2041	$self->clear_unique_items;
1905	$self->_load_objects ($uniq, 0);	2042	$self->_load_objects ($f);
		2043	$f->resolve_delayed_derefs;
		2044	}
1906	}	2045	}
1907	}	2046	}
1908		2047
1909	Coro::cede;	2048	$f->resolve_delayed_derefs;
		2049
		2050	cf::cede_to_tick;
1910	# now do the right thing for maps	2051	# now do the right thing for maps
1911	$self->link_multipart_objects;	2052	$self->link_multipart_objects;
1912	$self->difficulty ($self->estimate_difficulty)	2053	$self->difficulty ($self->estimate_difficulty)
1913	unless $self->difficulty;	2054	unless $self->difficulty;
1914	Coro::cede;	2055	cf::cede_to_tick;
1915		2056
1916	unless ($self->{deny_activate}) {	2057	unless ($self->{deny_activate}) {
1917	$self->decay_objects;	2058	$self->decay_objects;
1918	$self->fix_auto_apply;	2059	$self->fix_auto_apply;
1919	$self->update_buttons;	2060	$self->update_buttons;
1920	Coro::cede;	2061	cf::cede_to_tick;
1921	$self->set_darkness_map;	2062	$self->set_darkness_map;
1922	Coro::cede;	2063	cf::cede_to_tick;
1923	$self->activate;	2064	$self->activate;
1924	}	2065	}
1925		2066
1926	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1927	$self->last_access ($cf::RUNTIME);	2068	$self->last_access ($cf::RUNTIME);
…		…
1943		2084
1944	$self	2085	$self
1945	}	2086	}
1946		2087
1947	# find and load all maps in the 3x3 area around a map	2088	# find and load all maps in the 3x3 area around a map
1948	sub load_diag {	2089	sub load_neighbours {
1949	my ($map) = @_;	2090	my ($map) = @_;
1950		2091
1951	my @diag; # diagonal neighbours	2092	my @neigh; # diagonal neighbours
1952		2093
1953	for (0 .. 3) {	2094	for (0 .. 3) {
1954	my $neigh = $map->tile_path ($_)	2095	my $neigh = $map->tile_path ($_)
1955	or next;	2096	or next;
1956	$neigh = find $neigh, $map	2097	$neigh = find $neigh, $map
1957	or next;	2098	or next;
1958	$neigh->load;	2099	$neigh->load;
1959		2100
		2101	push @neigh,
1960	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2102	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1961	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2103	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1962	}	2104	}
1963		2105
1964	for (@diag) {	2106	for (grep defined $_->[0], @neigh) {
		2107	my ($path, $origin) = @$_;
1965	my $neigh = find @$_	2108	my $neigh = find $path, $origin
1966	or next;	2109	or next;
1967	$neigh->load;	2110	$neigh->load;
1968	}	2111	}
1969	}	2112	}
1970		2113
…		…
1975	}	2118	}
1976		2119
1977	sub do_load_sync {	2120	sub do_load_sync {
1978	my ($map) = @_;	2121	my ($map) = @_;
1979		2122
		2123	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2124	if $Coro::current == $Coro::main;
		2125
1980	cf::sync_job { $map->load };	2126	cf::sync_job { $map->load };
1981	}	2127	}
1982		2128
1983	our %MAP_PREFETCH;	2129	our %MAP_PREFETCH;
1984	our $MAP_PREFETCHER = undef;	2130	our $MAP_PREFETCHER = undef;
1985		2131
1986	sub find_async {	2132	sub find_async {
1987	my ($path, $origin) = @_;	2133	my ($path, $origin, $load) = @_;
1988		2134
1989	$path = normalise $path, $origin && $origin->{path};	2135	$path = normalise $path, $origin && $origin->{path};
1990		2136
1991	if (my $map = $cf::MAP{$path}) {	2137	if (my $map = $cf::MAP{$path}) {
1992	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2138	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993	}	2139	}
1994		2140
1995	undef $MAP_PREFETCH{$path};	2141	$MAP_PREFETCH{$path} |= $load;
		2142
1996	$MAP_PREFETCHER ||= cf::async {	2143	$MAP_PREFETCHER ||= cf::async {
		2144	$Coro::current->{desc} = "map prefetcher";
		2145
1997	while (%MAP_PREFETCH) {	2146	while (%MAP_PREFETCH) {
1998	for my $path (keys %MAP_PREFETCH) {	2147	while (my ($k, $v) = each %MAP_PREFETCH) {
1999	if (my $map = find $path) {	2148	if (my $map = find $k) {
2000	$map->load;	2149	$map->load if $v;
2001	}	2150	}
2002		2151
2003	delete $MAP_PREFETCH{$path};	2152	delete $MAP_PREFETCH{$k};
2004	}	2153	}
2005	}	2154	}
2006	undef $MAP_PREFETCHER;	2155	undef $MAP_PREFETCHER;
2007	};	2156	};
2008	$MAP_PREFETCHER->prio (6);	2157	$MAP_PREFETCHER->prio (6);
…		…
2011	}	2160	}
2012		2161
2013	sub save {	2162	sub save {
2014	my ($self) = @_;	2163	my ($self) = @_;
2015		2164
2016	my $lock = cf::lock_acquire "map_data:" . $self->path;	2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
2017		2166
2018	$self->{last_save} = $cf::RUNTIME;	2167	$self->{last_save} = $cf::RUNTIME;
2019		2168
2020	return unless $self->dirty;	2169	return unless $self->dirty;
2021		2170
…		…
2027	return if $self->{deny_save};	2176	return if $self->{deny_save};
2028		2177
2029	local $self->{last_access} = $self->last_access;#d#	2178	local $self->{last_access} = $self->last_access;#d#
2030		2179
2031	cf::async {	2180	cf::async {
		2181	$Coro::current->{desc} = "map player save";
2032	$_->contr->save for $self->players;	2182	$_->contr->save for $self->players;
2033	};	2183	};
2034		2184
2035	if ($uniq) {	2185	if ($uniq) {
2036	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2186	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
2044	my ($self) = @_;	2194	my ($self) = @_;
2045		2195
2046	# save first because save cedes	2196	# save first because save cedes
2047	$self->save;	2197	$self->save;
2048		2198
2049	my $lock = cf::lock_acquire "map_data:" . $self->path;	2199	my $lock = cf::lock_acquire "map_data:$self->{path}";
2050		2200
2051	return if $self->players;	2201	return if $self->players;
2052	return if $self->in_memory != cf::MAP_IN_MEMORY;	2202	return if $self->in_memory != cf::MAP_IN_MEMORY;
2053	return if $self->{deny_save};	2203	return if $self->{deny_save};
2054		2204
		2205	$self->in_memory (cf::MAP_SWAPPED);
		2206
		2207	$self->deactivate;
		2208	$_->clear_links_to ($self) for values %cf::MAP;
2055	$self->clear;	2209	$self->clear;
2056	$self->in_memory (cf::MAP_SWAPPED);
2057	}	2210	}
2058		2211
2059	sub reset_at {	2212	sub reset_at {
2060	my ($self) = @_;	2213	my ($self) = @_;
2061		2214
…		…
2093	if $uniq;	2246	if $uniq;
2094	}	2247	}
2095		2248
2096	delete $cf::MAP{$self->path};	2249	delete $cf::MAP{$self->path};
2097		2250
		2251	$self->deactivate;
		2252	$_->clear_links_to ($self) for values %cf::MAP;
2098	$self->clear;	2253	$self->clear;
2099
2100	$_->clear_links_to ($self) for values %cf::MAP;
2101		2254
2102	$self->unlink_save;	2255	$self->unlink_save;
2103	$self->destroy;	2256	$self->destroy;
2104	}	2257	}
2105		2258
2106	my $nuke_counter = "aaaa";	2259	my $nuke_counter = "aaaa";
2107		2260
2108	sub nuke {	2261	sub nuke {
2109	my ($self) = @_;	2262	my ($self) = @_;
2110		2263
		2264	{
		2265	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2266
2111	delete $cf::MAP{$self->path};	2267	delete $cf::MAP{$self->path};
2112		2268
2113	$self->unlink_save;	2269	$self->unlink_save;
2114		2270
2115	bless $self, "cf::map";	2271	bless $self, "cf::map";
2116	delete $self->{deny_reset};	2272	delete $self->{deny_reset};
2117	$self->{deny_save} = 1;	2273	$self->{deny_save} = 1;
2118	$self->reset_timeout (1);	2274	$self->reset_timeout (1);
2119	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2275	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120		2276
2121	$cf::MAP{$self->path} = $self;	2277	$cf::MAP{$self->path} = $self;
		2278	}
2122		2279
2123	$self->reset; # polite request, might not happen	2280	$self->reset; # polite request, might not happen
2124	}	2281	}
2125		2282
2126	=item $maps = cf::map::tmp_maps	2283	=item $maps = cf::map::tmp_maps
…		…
2202		2359
2203	sub inv_recursive {	2360	sub inv_recursive {
2204	inv_recursive_ inv $_[0]	2361	inv_recursive_ inv $_[0]
2205	}	2362	}
2206		2363
		2364	=item $ref = $ob->ref
		2365
		2366	creates and returns a persistent reference to an objetc that can be stored as a string.
		2367
		2368	=item $ob = cf::object::deref ($refstring)
		2369
		2370	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2371	even if the object actually exists. May block.
		2372
		2373	=cut
		2374
		2375	sub deref {
		2376	my ($ref) = @_;
		2377
		2378	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2379	my ($uuid, $name) = ($1, $2);
		2380	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2381	or return;
		2382	$pl->ob->uuid eq $uuid
		2383	or return;
		2384
		2385	$pl->ob
		2386	} else {
		2387	warn "$ref: cannot resolve object reference\n";
		2388	undef
		2389	}
		2390	}
		2391
2207	package cf;	2392	package cf;
2208		2393
2209	=back	2394	=back
2210		2395
2211	=head3 cf::object::player	2396	=head3 cf::object::player
…		…
2243	$self->message ($msg, $flags);	2428	$self->message ($msg, $flags);
2244	}	2429	}
2245	}	2430	}
2246	}	2431	}
2247		2432
		2433	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2434
		2435	=cut
		2436
		2437	sub cf::object::send_msg {
		2438	my $pl = shift->contr
		2439	or return;
		2440	$pl->send_msg (@_);
		2441	}
		2442
2248	=item $player_object->may ("access")	2443	=item $player_object->may ("access")
2249		2444
2250	Returns wether the given player is authorized to access resource "access"	2445	Returns wether the given player is authorized to access resource "access"
2251	(e.g. "command_wizcast").	2446	(e.g. "command_wizcast").
2252		2447
…		…
2329	# use -1 or undef as default coordinates, not 0, 0	2524	# use -1 or undef as default coordinates, not 0, 0
2330	($x, $y) = ($map->enter_x, $map->enter_y)	2525	($x, $y) = ($map->enter_x, $map->enter_y)
2331	if $x <=0 && $y <= 0;	2526	if $x <=0 && $y <= 0;
2332		2527
2333	$map->load;	2528	$map->load;
2334	$map->load_diag;	2529	$map->load_neighbours;
2335		2530
2336	return unless $self->contr->active;	2531	return unless $self->contr->active;
2337	$self->activate_recursive;	2532	$self->activate_recursive;
2338		2533
2339	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2534	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2359	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2554	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360		2555
2361	$self->enter_link;	2556	$self->enter_link;
2362		2557
2363	(async {	2558	(async {
		2559	$Coro::current->{desc} = "player::goto $path $x $y";
		2560
		2561	# *tag paths override both path and x|y
		2562	if ($path =~ /^\*(.*)$/) {
		2563	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2564	my $ob = $obs[rand @obs];
		2565
		2566	# see if we actually can go there
		2567	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2568	$ob = $obs[rand @obs];
		2569	} else {
		2570	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2571	}
		2572	# else put us there anyways for now #d#
		2573
		2574	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2575	} else {
		2576	($path, $x, $y) = (undef, undef, undef);
		2577	}
		2578	}
		2579
2364	my $map = eval {	2580	my $map = eval {
2365	my $map = cf::map::find $path;	2581	my $map = defined $path ? cf::map::find $path : undef;
2366		2582
2367	if ($map) {	2583	if ($map) {
2368	$map = $map->customise_for ($self);	2584	$map = $map->customise_for ($self);
2369	$map = $check->($map) if $check && $map;	2585	$map = $check->($map) if $check && $map;
2370	} else {	2586	} else {
2371	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2587	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372	}	2588	}
2373		2589
2374	$map	2590	$map
2375	};	2591	};
2376		2592
…		…
2429	$rmp->{origin_y} = $exit->y;	2645	$rmp->{origin_y} = $exit->y;
2430	}	2646	}
2431		2647
2432	$rmp->{random_seed} ||= $exit->random_seed;	2648	$rmp->{random_seed} ||= $exit->random_seed;
2433		2649
2434	my $data = cf::to_json $rmp;	2650	my $data = cf::encode_json $rmp;
2435	my $md5 = Digest::MD5::md5_hex $data;	2651	my $md5 = Digest::MD5::md5_hex $data;
2436	my $meta = "$RANDOMDIR/$md5.meta";	2652	my $meta = "$RANDOMDIR/$md5.meta";
2437		2653
2438	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2654	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439	aio_write $fh, 0, (length $data), $data, 0;	2655	aio_write $fh, 0, (length $data), $data, 0;
…		…
2466	# if exit is damned, update players death & WoR home-position	2682	# if exit is damned, update players death & WoR home-position
2467	$self->contr->savebed ($slaying, $hp, $sp)	2683	$self->contr->savebed ($slaying, $hp, $sp)
2468	if $exit->flag (FLAG_DAMNED);	2684	if $exit->flag (FLAG_DAMNED);
2469		2685
2470	(async {	2686	(async {
		2687	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2688
2471	$self->deactivate_recursive; # just to be sure	2689	$self->deactivate_recursive; # just to be sure
2472	unless (eval {	2690	unless (eval {
2473	$self->goto ($slaying, $hp, $sp);	2691	$self->goto ($slaying, $hp, $sp);
2474		2692
2475	1;	2693	1;
…		…
2510	the message, with C<log> being the default. If C<$color> is negative, suppress	2728	the message, with C<log> being the default. If C<$color> is negative, suppress
2511	the message unless the client supports the msg packet.	2729	the message unless the client supports the msg packet.
2512		2730
2513	=cut	2731	=cut
2514		2732
		2733	# non-persistent channels (usually the info channel)
		2734	our %CHANNEL = (
		2735	"c/identify" => {
		2736	id => "infobox",
		2737	title => "Identify",
		2738	reply => undef,
		2739	tooltip => "Items recently identified",
		2740	},
		2741	"c/examine" => {
		2742	id => "infobox",
		2743	title => "Examine",
		2744	reply => undef,
		2745	tooltip => "Signs and other items you examined",
		2746	},
		2747	"c/book" => {
		2748	id => "infobox",
		2749	title => "Book",
		2750	reply => undef,
		2751	tooltip => "The contents of a note or book",
		2752	},
		2753	"c/lookat" => {
		2754	id => "infobox",
		2755	title => "Look",
		2756	reply => undef,
		2757	tooltip => "What you saw there",
		2758	},
		2759	"c/who" => {
		2760	id => "infobox",
		2761	title => "Players",
		2762	reply => undef,
		2763	tooltip => "Shows players who are currently online",
		2764	},
		2765	"c/body" => {
		2766	id => "infobox",
		2767	title => "Body Parts",
		2768	reply => undef,
		2769	tooltip => "Shows which body parts you posess and are available",
		2770	},
		2771	"c/uptime" => {
		2772	id => "infobox",
		2773	title => "Uptime",
		2774	reply => undef,
		2775	tooltip => "How long the server has been running since last restart",
		2776	},
		2777	"c/mapinfo" => {
		2778	id => "infobox",
		2779	title => "Map Info",
		2780	reply => undef,
		2781	tooltip => "Information related to the maps",
		2782	},
		2783	);
		2784
2515	sub cf::client::send_msg {	2785	sub cf::client::send_msg {
2516	my ($self, $channel, $msg, $color, @extra) = @_;	2786	my ($self, $channel, $msg, $color, @extra) = @_;
2517		2787
2518	$msg = $self->pl->expand_cfpod ($msg);	2788	$msg = $self->pl->expand_cfpod ($msg);
2519		2789
2520	$color &= cf::NDI_CLIENT_MASK; # just in case...	2790	$color &= cf::NDI_CLIENT_MASK; # just in case...
2521		2791
		2792	# check predefined channels, for the benefit of C
		2793	if ($CHANNEL{$channel}) {
		2794	$channel = $CHANNEL{$channel};
		2795
		2796	$self->ext_msg (channel_info => $channel)
		2797	if $self->can_msg;
		2798
		2799	$channel = $channel->{id};
		2800
2522	if (ref $channel) {	2801	} elsif (ref $channel) {
2523	# send meta info to client, if not yet sent	2802	# send meta info to client, if not yet sent
2524	unless (exists $self->{channel}{$channel->{id}}) {	2803	unless (exists $self->{channel}{$channel->{id}}) {
2525	$self->{channel}{$channel->{id}} = $channel;	2804	$self->{channel}{$channel->{id}} = $channel;
2526	$self->ext_msg (channel_info => $channel);	2805	$self->ext_msg (channel_info => $channel)
		2806	if $self->can_msg;
2527	}	2807	}
2528		2808
2529	$channel = $channel->{id};	2809	$channel = $channel->{id};
2530	}	2810	}
2531		2811
…		…
2553	$color &= cf::NDI_COLOR_MASK;	2833	$color &= cf::NDI_COLOR_MASK;
2554		2834
2555	utf8::encode $msg;	2835	utf8::encode $msg;
2556		2836
2557	if (0 && $msg =~ /\[/) {	2837	if (0 && $msg =~ /\[/) {
		2838	# COMMAND/INFO
2558	$self->send_packet ("drawextinfo $color 4 0 $msg")	2839	$self->send_packet ("drawextinfo $color 10 8 $msg")
2559	} else {	2840	} else {
2560	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2841	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2561	$self->send_packet ("drawinfo $color $msg")	2842	$self->send_packet ("drawinfo $color $msg")
2562	}	2843	}
2563	}	2844	}
…		…
2571	=cut	2852	=cut
2572		2853
2573	sub cf::client::ext_msg($$@) {	2854	sub cf::client::ext_msg($$@) {
2574	my ($self, $type, @msg) = @_;	2855	my ($self, $type, @msg) = @_;
2575		2856
2576	my $extcmd = $self->extcmd;
2577
2578	if ($extcmd == 2) {	2857	if ($self->extcmd == 2) {
2579	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	2858	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2580	} elsif ($extcmd == 1) { # TODO: remove	2859	} elsif ($self->extcmd == 1) { # TODO: remove
2581	push @msg, msgtype => "event_$type";	2860	push @msg, msgtype => "event_$type";
		2861	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2862	}
		2863	}
		2864
		2865	=item $client->ext_reply ($msgid, @msg)
		2866
		2867	Sends an ext reply to the client.
		2868
		2869	=cut
		2870
		2871	sub cf::client::ext_reply($$@) {
		2872	my ($self, $id, @msg) = @_;
		2873
		2874	if ($self->extcmd == 2) {
		2875	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2876	} elsif ($self->extcmd == 1) {
		2877	#TODO: version 1, remove
		2878	unshift @msg, msgtype => "reply", msgid => $id;
2582	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2879	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2583	}	2880	}
2584	}	2881	}
2585		2882
2586	=item $success = $client->query ($flags, "text", \&cb)	2883	=item $success = $client->query ($flags, "text", \&cb)
…		…
2648	my ($type, $reply, @payload) =	2945	my ($type, $reply, @payload) =
2649	"ARRAY" eq ref $msg	2946	"ARRAY" eq ref $msg
2650	? @$msg	2947	? @$msg
2651	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	2948	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2652		2949
		2950	my @reply;
		2951
2653	if (my $cb = $EXTICMD{$type}) {	2952	if (my $cb = $EXTICMD{$type}) {
2654	my @reply = $cb->($ns, @payload);	2953	@reply = $cb->($ns, @payload);
2655
2656	$ns->ext_reply ($reply, @reply)
2657	if $reply;
2658	}	2954	}
		2955
		2956	$ns->ext_reply ($reply, @reply)
		2957	if $reply;
		2958
2659	} else {	2959	} else {
2660	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2960	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2661	}	2961	}
2662		2962
2663	cf::override;	2963	cf::override;
…		…
2723	=pod	3023	=pod
2724		3024
2725	The following functions and methods are available within a safe environment:	3025	The following functions and methods are available within a safe environment:
2726		3026
2727	cf::object	3027	cf::object
2728	contr pay_amount pay_player map x y force_find force_add	3028	contr pay_amount pay_player map x y force_find force_add destroy
2729	insert remove	3029	insert remove name archname title slaying race decrease_ob_nr
2730		3030
2731	cf::object::player	3031	cf::object::player
2732	player	3032	player
2733		3033
2734	cf::player	3034	cf::player
…		…
2739		3039
2740	=cut	3040	=cut
2741		3041
2742	for (	3042	for (
2743	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3043	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2744	insert remove inv)],	3044	insert remove inv name archname title slaying race
		3045	decrease_ob_nr destroy)],
2745	["cf::object::player" => qw(player)],	3046	["cf::object::player" => qw(player)],
2746	["cf::player" => qw(peaceful)],	3047	["cf::player" => qw(peaceful)],
2747	["cf::map" => qw(trigger)],	3048	["cf::map" => qw(trigger)],
2748	) {	3049	) {
2749	no strict 'refs';	3050	no strict 'refs';
…		…
2825	# the server's init and main functions	3126	# the server's init and main functions
2826		3127
2827	sub load_facedata($) {	3128	sub load_facedata($) {
2828	my ($path) = @_;	3129	my ($path) = @_;
2829		3130
		3131	# HACK to clear player env face cache, we need some signal framework
		3132	# for this (global event?)
		3133	%ext::player_env::MUSIC_FACE_CACHE = ();
		3134
		3135	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3136
2830	warn "loading facedata from $path\n";	3137	warn "loading facedata from $path\n";
2831		3138
2832	my $facedata;	3139	my $facedata;
2833	0 < aio_load $path, $facedata	3140	0 < aio_load $path, $facedata
2834	or die "$path: $!";	3141	or die "$path: $!";
…		…
2836	$facedata = Coro::Storable::thaw $facedata;	3143	$facedata = Coro::Storable::thaw $facedata;
2837		3144
2838	$facedata->{version} == 2	3145	$facedata->{version} == 2
2839	or cf::cleanup "$path: version mismatch, cannot proceed.";	3146	or cf::cleanup "$path: version mismatch, cannot proceed.";
2840		3147
		3148	# patch in the exptable
		3149	$facedata->{resource}{"res/exp_table"} = {
		3150	type => FT_RSRC,
		3151	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3152	};
		3153	cf::cede_to_tick;
		3154
2841	{	3155	{
2842	my $faces = $facedata->{faceinfo};	3156	my $faces = $facedata->{faceinfo};
2843		3157
2844	while (my ($face, $info) = each %$faces) {	3158	while (my ($face, $info) = each %$faces) {
2845	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3159	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3160
2846	cf::face::set_visibility $idx, $info->{visibility};	3161	cf::face::set_visibility $idx, $info->{visibility};
2847	cf::face::set_magicmap $idx, $info->{magicmap};	3162	cf::face::set_magicmap $idx, $info->{magicmap};
2848	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3163	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2849	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3164	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2850		3165
2851	cf::cede_to_tick;	3166	cf::cede_to_tick;
2852	}	3167	}
2853		3168
2854	while (my ($face, $info) = each %$faces) {	3169	while (my ($face, $info) = each %$faces) {
2855	next unless $info->{smooth};	3170	next unless $info->{smooth};
		3171
2856	my $idx = cf::face::find $face	3172	my $idx = cf::face::find $face
2857	or next;	3173	or next;
		3174
2858	if (my $smooth = cf::face::find $info->{smooth}) {	3175	if (my $smooth = cf::face::find $info->{smooth}) {
2859	cf::face::set_smooth $idx, $smooth;	3176	cf::face::set_smooth $idx, $smooth;
2860	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3177	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2861	} else {	3178	} else {
2862	warn "smooth face '$info->{smooth}' not found for face '$face'";	3179	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
2879		3196
2880	{	3197	{
2881	# TODO: for gcfclient pleasure, we should give resources	3198	# TODO: for gcfclient pleasure, we should give resources
2882	# that gcfclient doesn't grok a >10000 face index.	3199	# that gcfclient doesn't grok a >10000 face index.
2883	my $res = $facedata->{resource};	3200	my $res = $facedata->{resource};
2884	my $enc = JSON::XS->new->utf8->canonical;
2885
2886	my $soundconf = delete $res->{"res/sound.conf"};
2887		3201
2888	while (my ($name, $info) = each %$res) {	3202	while (my ($name, $info) = each %$res) {
2889	my $meta = $enc->encode ({	3203	if (defined $info->{type}) {
2890	name => $name,
2891	%{ $info->{meta} || {} },
2892	});
2893
2894	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3204	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3205	my $data;
2895		3206
2896	if ($info->{type} & 1) {	3207	if ($info->{type} & 1) {
2897	# prepend meta info	3208	# prepend meta info
2898		3209
		3210	my $meta = $enc->encode ({
		3211	name => $name,
		3212	%{ $info->{meta} || {} },
		3213	});
		3214
2899	my $data = pack "(w/a*)*", $meta, $info->{data};	3215	$data = pack "(w/a*)*", $meta, $info->{data};
2900	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata	3216	} else {
		3217	$data = $info->{data};
		3218	}
2901		3219
2902	cf::face::set_data $idx, 0, $data, $chk;	3220	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3221	cf::face::set_type $idx, $info->{type};
2903	} else {	3222	} else {
2904	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};	3223	$RESOURCE{$name} = $info;
2905	}	3224	}
2906		3225
2907	cf::face::set_type $idx, $info->{type};
2908
2909	cf::cede_to_tick;	3226	cf::cede_to_tick;
2910	}	3227	}
2911
2912	if ($soundconf) {
2913	$soundconf = $enc->decode (delete $soundconf->{data});
2914
2915	for (0 .. SOUND_CAST_SPELL_0 - 1) {
2916	my $sound = $soundconf->{compat}[$_]
2917	or next;
2918
2919	my $face = cf::face::find "sound/$sound->[1]";
2920	cf::sound::set $sound->[0] => $face;
2921	cf::sound::old_sound_index $_, $face; # gcfclient-compat
2922	}
2923
2924	while (my ($k, $v) = each %{$soundconf->{event}}) {
2925	my $face = cf::face::find "sound/$v";
2926	cf::sound::set $k => $face;
2927	}
2928	}
2929	}	3228	}
		3229
		3230	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2930		3231
2931	1	3232	1
2932	}	3233	}
		3234
		3235	cf::global->attach (on_resource_update => sub {
		3236	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
		3237	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
		3238
		3239	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3240	my $sound = $soundconf->{compat}[$_]
		3241	or next;
		3242
		3243	my $face = cf::face::find "sound/$sound->[1]";
		3244	cf::sound::set $sound->[0] => $face;
		3245	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3246	}
		3247
		3248	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3249	my $face = cf::face::find "sound/$v";
		3250	cf::sound::set $k => $face;
		3251	}
		3252	}
		3253	});
2933		3254
2934	register_exticmd fx_want => sub {	3255	register_exticmd fx_want => sub {
2935	my ($ns, $want) = @_;	3256	my ($ns, $want) = @_;
2936		3257
2937	while (my ($k, $v) = each %$want) {	3258	while (my ($k, $v) = each %$want) {
2938	$ns->fx_want ($k, $v);	3259	$ns->fx_want ($k, $v);
2939	}	3260	}
2940	};	3261	};
2941		3262
2942	sub reload_regions {	3263	sub reload_regions {
		3264	# HACK to clear player env face cache, we need some signal framework
		3265	# for this (global event?)
		3266	%ext::player_env::MUSIC_FACE_CACHE = ();
		3267
2943	load_resource_file "$MAPDIR/regions"	3268	load_resource_file "$MAPDIR/regions"
2944	or die "unable to load regions file\n";	3269	or die "unable to load regions file\n";
2945		3270
2946	for (cf::region::list) {	3271	for (cf::region::list) {
2947	$_->{match} = qr/$_->{match}/	3272	$_->{match} = qr/$_->{match}/
…		…
2983		3308
2984	sub init {	3309	sub init {
2985	reload_resources;	3310	reload_resources;
2986	}	3311	}
2987		3312
2988	sub cfg_load {	3313	sub reload_config {
2989	open my $fh, "<:utf8", "$CONFDIR/config"	3314	open my $fh, "<:utf8", "$CONFDIR/config"
2990	or return;	3315	or return;
2991		3316
2992	local $/;	3317	local $/;
2993	*CFG = YAML::Syck::Load <$fh>;	3318	*CFG = YAML::Syck::Load <$fh>;
…		…
3009	sub main {	3334	sub main {
3010	# we must not ever block the main coroutine	3335	# we must not ever block the main coroutine
3011	local $Coro::idle = sub {	3336	local $Coro::idle = sub {
3012	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3337	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3013	(async {	3338	(async {
3014	Event::one_event;	3339	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3340	EV::loop EV::LOOP_ONESHOT;
3015	})->prio (Coro::PRIO_MAX);	3341	})->prio (Coro::PRIO_MAX);
3016	};	3342	};
3017		3343
3018	cfg_load;	3344	reload_config;
3019	db_init;	3345	db_init;
3020	load_extensions;	3346	load_extensions;
3021		3347
3022	$TICK_WATCHER->start;	3348	$TICK_WATCHER->start;
		3349	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3023	Event::loop;	3350	EV::loop;
3024	}	3351	}
3025		3352
3026	#############################################################################	3353	#############################################################################
3027	# initialisation and cleanup	3354	# initialisation and cleanup
3028		3355
3029	# install some emergency cleanup handlers	3356	# install some emergency cleanup handlers
3030	BEGIN {	3357	BEGIN {
		3358	our %SIGWATCHER = ();
3031	for my $signal (qw(INT HUP TERM)) {	3359	for my $signal (qw(INT HUP TERM)) {
3032	Event->signal (	3360	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3033	reentrant => 0,
3034	data => WF_AUTOCANCEL,
3035	signal => $signal,
3036	prio => 0,
3037	cb => sub {
3038	cf::cleanup "SIG$signal";	3361	cf::cleanup "SIG$signal";
3039	},
3040	);	3362	};
3041	}	3363	}
3042	}	3364	}
3043		3365
3044	sub write_runtime {	3366	sub write_runtime {
3045	my $runtime = "$LOCALDIR/runtime";	3367	my $runtime = "$LOCALDIR/runtime";
…		…
3090	# and maps saved/destroyed asynchronously.	3412	# and maps saved/destroyed asynchronously.
3091	warn "begin emergency player save\n";	3413	warn "begin emergency player save\n";
3092	for my $login (keys %cf::PLAYER) {	3414	for my $login (keys %cf::PLAYER) {
3093	my $pl = $cf::PLAYER{$login} or next;	3415	my $pl = $cf::PLAYER{$login} or next;
3094	$pl->valid or next;	3416	$pl->valid or next;
		3417	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3095	$pl->save;	3418	$pl->save;
3096	}	3419	}
3097	warn "end emergency player save\n";	3420	warn "end emergency player save\n";
3098		3421
3099	warn "begin emergency map save\n";	3422	warn "begin emergency map save\n";
…		…
3138	warn "syncing database to disk";	3461	warn "syncing database to disk";
3139	BDB::db_env_txn_checkpoint $DB_ENV;	3462	BDB::db_env_txn_checkpoint $DB_ENV;
3140		3463
3141	# if anything goes wrong in here, we should simply crash as we already saved	3464	# if anything goes wrong in here, we should simply crash as we already saved
3142		3465
3143	warn "cancelling all WF_AUTOCANCEL watchers";
3144	for (Event::all_watchers) {
3145	$_->cancel if $_->data & WF_AUTOCANCEL;
3146	}
3147
3148	warn "flushing outstanding aio requests";	3466	warn "flushing outstanding aio requests";
3149	for (;;) {	3467	for (;;) {
3150	BDB::flush;	3468	BDB::flush;
3151	IO::AIO::flush;	3469	IO::AIO::flush;
3152	Coro::cede;	3470	Coro::cede_notself;
3153	last unless IO::AIO::nreqs || BDB::nreqs;	3471	last unless IO::AIO::nreqs || BDB::nreqs;
3154	warn "iterate...";	3472	warn "iterate...";
3155	}	3473	}
3156		3474
3157	++$RELOAD;	3475	++$RELOAD;
…		…
3216	warn "reloading cf.pm";	3534	warn "reloading cf.pm";
3217	require cf;	3535	require cf;
3218	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3536	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3219		3537
3220	warn "loading config and database again";	3538	warn "loading config and database again";
3221	cf::cfg_load;	3539	cf::reload_config;
3222		3540
3223	warn "loading extensions";	3541	warn "loading extensions";
3224	cf::load_extensions;	3542	cf::load_extensions;
3225		3543
3226	warn "reattaching attachments to objects/players";	3544	warn "reattaching attachments to objects/players";
…		…
3246		3564
3247	sub reload_perl() {	3565	sub reload_perl() {
3248	# doing reload synchronously and two reloads happen back-to-back,	3566	# doing reload synchronously and two reloads happen back-to-back,
3249	# coro crashes during coro_state_free->destroy here.	3567	# coro crashes during coro_state_free->destroy here.
3250		3568
3251	$RELOAD_WATCHER ||= Event->timer (	3569	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3252	reentrant => 0,
3253	after => 0,
3254	data => WF_AUTOCANCEL,
3255	cb => sub {
3256	do_reload_perl;
3257	undef $RELOAD_WATCHER;	3570	undef $RELOAD_WATCHER;
3258	},	3571	do_reload_perl;
3259	);	3572	};
3260	}	3573	}
3261		3574
3262	register_command "reload" => sub {	3575	register_command "reload" => sub {
3263	my ($who, $arg) = @_;	3576	my ($who, $arg) = @_;
3264		3577
3265	if ($who->flag (FLAG_WIZ)) {	3578	if ($who->flag (FLAG_WIZ)) {
3266	$who->message ("reloading server.");	3579	$who->message ("reloading server.");
		3580	async {
		3581	$Coro::current->{desc} = "perl_reload";
3267	async { reload_perl };	3582	reload_perl;
		3583	};
3268	}	3584	}
3269	};	3585	};
3270		3586
3271	unshift @INC, $LIBDIR;	3587	unshift @INC, $LIBDIR;
3272		3588
…		…
3291	my $signal = new Coro::Signal;	3607	my $signal = new Coro::Signal;
3292	push @WAIT_FOR_TICK_BEGIN, $signal;	3608	push @WAIT_FOR_TICK_BEGIN, $signal;
3293	$signal->wait;	3609	$signal->wait;
3294	}	3610	}
3295		3611
3296	my $min = 1e6;#d#	3612	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3297	my $avg = 10;
3298	$TICK_WATCHER = Event->timer (
3299	reentrant => 0,
3300	parked => 1,
3301	prio => 0,
3302	at => $NEXT_TICK || $TICK,
3303	data => WF_AUTOCANCEL,
3304	cb => sub {
3305	if ($Coro::current != $Coro::main) {	3613	if ($Coro::current != $Coro::main) {
3306	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3614	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3307	unless ++$bug_warning > 10;	3615	unless ++$bug_warning > 10;
3308	return;	3616	return;
3309	}	3617	}
3310		3618
3311	$NOW = $tick_start = Event::time;	3619	$NOW = $tick_start = EV::now;
3312		3620
3313	cf::server_tick; # one server iteration	3621	cf::server_tick; # one server iteration
3314		3622
3315	0 && sync_job {#d#	3623	$RUNTIME += $TICK;
3316	for(1..10) {	3624	$NEXT_TICK = $_[0]->at;
3317	my $t = Event::time;
3318	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3319	or die;
3320		3625
3321	$map->width (50);	3626	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3322	$map->height (50);	3627	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3323	$map->alloc;	3628	Coro::async_pool {
3324	$map->_load_objects ("/tmp/x.map", 1);	3629	$Coro::current->{desc} = "runtime saver";
3325	my $t = Event::time - $t;	3630	write_runtime
3326		3631	or warn "ERROR: unable to write runtime file: $!";
3327	#next unless $t < 0.0013;#d#
3328	if ($t < $min) {
3329	$min = $t;
3330	}
3331	$avg = $avg * 0.99 + $t * 0.01;
3332	}
3333	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3334	exit 0;
3335	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3336	};	3632	};
		3633	}
3337		3634
3338	$RUNTIME += $TICK;
3339	$NEXT_TICK += $TICK;
3340
3341	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3342	$NEXT_RUNTIME_WRITE = $NOW + 10;
3343	Coro::async_pool {
3344	write_runtime
3345	or warn "ERROR: unable to write runtime file: $!";
3346	};
3347	}
3348
3349	# my $AFTER = Event::time;
3350	# warn $AFTER - $NOW;#d#
3351
3352	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3635	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3353	$sig->send;	3636	$sig->send;
3354	}	3637	}
3355	while (my $sig = shift @WAIT_FOR_TICK) {	3638	while (my $sig = shift @WAIT_FOR_TICK) {
3356	$sig->send;	3639	$sig->send;
3357	}	3640	}
3358		3641
3359	$NOW = Event::time;
3360
3361	# if we are delayed by four ticks or more, skip them all
3362	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3363
3364	$TICK_WATCHER->at ($NEXT_TICK);
3365	$TICK_WATCHER->start;
3366
3367	$LOAD = ($NOW - $tick_start) / $TICK;	3642	$LOAD = ($NOW - $tick_start) / $TICK;
3368	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3643	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3369		3644
3370	_post_tick;	3645	_post_tick;
3371		3646	};
3372		3647	$TICK_WATCHER->priority (EV::MAXPRI);
3373	},
3374	);
3375		3648
3376	{	3649	{
3377	BDB::max_poll_time $TICK * 0.1;	3650	# configure BDB
3378	$BDB_POLL_WATCHER = Event->io (	3651
3379	reentrant => 0,
3380	fd => BDB::poll_fileno,
3381	poll => 'r',
3382	prio => 0,
3383	data => WF_AUTOCANCEL,
3384	cb => \&BDB::poll_cb,
3385	);
3386	BDB::min_parallel 8;	3652	BDB::min_parallel 8;
3387		3653	BDB::max_poll_reqs $TICK * 0.1;
3388	BDB::set_sync_prepare {	3654	$Coro::BDB::WATCHER->priority (1);
3389	my $status;
3390	my $current = $Coro::current;
3391	(
3392	sub {
3393	$status = $!;
3394	$current->ready; undef $current;
3395	},
3396	sub {
3397	Coro::schedule while defined $current;
3398	$! = $status;
3399	},
3400	)
3401	};
3402		3655
3403	unless ($DB_ENV) {	3656	unless ($DB_ENV) {
3404	$DB_ENV = BDB::db_env_create;	3657	$DB_ENV = BDB::db_env_create;
		3658	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3659	| BDB::LOG_AUTOREMOVE, 1);
		3660	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3661	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3405		3662
3406	cf::sync_job {	3663	cf::sync_job {
3407	eval {	3664	eval {
3408	BDB::db_env_open	3665	BDB::db_env_open
3409	$DB_ENV,	3666	$DB_ENV,
…		…
3411	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3668	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3412	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3669	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3413	0666;	3670	0666;
3414		3671
3415	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3672	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3416
3417	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3418	$DB_ENV->set_lk_detect;
3419	};	3673	};
3420		3674
3421	cf::cleanup "db_env_open(db): $@" if $@;	3675	cf::cleanup "db_env_open(db): $@" if $@;
3422	};	3676	};
3423	}	3677	}
		3678
		3679	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3680	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3681	};
		3682	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3683	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3684	};
		3685	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3686	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3687	};
3424	}	3688	}
3425		3689
3426	{	3690	{
		3691	# configure IO::AIO
		3692
3427	IO::AIO::min_parallel 8;	3693	IO::AIO::min_parallel 8;
3428
3429	undef $Coro::AIO::WATCHER;
3430	IO::AIO::max_poll_time $TICK * 0.1;	3694	IO::AIO::max_poll_time $TICK * 0.1;
3431	$AIO_POLL_WATCHER = Event->io (	3695	$Coro::AIO::WATCHER->priority (1);
3432	reentrant => 0,
3433	data => WF_AUTOCANCEL,
3434	fd => IO::AIO::poll_fileno,
3435	poll => 'r',
3436	prio => 6,
3437	cb => \&IO::AIO::poll_cb,
3438	);
3439	}	3696	}
3440		3697
3441	my $_log_backtrace;	3698	my $_log_backtrace;
3442		3699
3443	sub _log_backtrace {	3700	sub _log_backtrace {
…		…
3447		3704
3448	# limit the # of concurrent backtraces	3705	# limit the # of concurrent backtraces
3449	if ($_log_backtrace < 2) {	3706	if ($_log_backtrace < 2) {
3450	++$_log_backtrace;	3707	++$_log_backtrace;
3451	async {	3708	async {
		3709	$Coro::current->{desc} = "abt $msg";
		3710
3452	my @bt = fork_call {	3711	my @bt = fork_call {
3453	@addr = map { sprintf "%x", $_ } @addr;	3712	@addr = map { sprintf "%x", $_ } @addr;
3454	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3713	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3455	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3714	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3456	or die "addr2line: $!";	3715	or die "addr2line: $!";

Diff Legend

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