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.332 by root, Sat Aug 18 17:33:53 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.64 ();	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;
24	use Coro::Util ();	25	use Coro::Util ();
25		26
26	use JSON::XS 1.4 ();	27	use JSON::XS 2.01 ();
27	use BDB ();	28	use BDB ();
28	use Data::Dumper;	29	use Data::Dumper;
29	use Digest::MD5;	30	use Digest::MD5;
30	use Fcntl;	31	use Fcntl;
31	use YAML::Syck ();	32	use YAML::Syck ();
32	use IO::AIO 2.32 ();	33	use IO::AIO 2.51 ();
33	use Time::HiRes;	34	use Time::HiRes;
34	use Compress::LZF;	35	use Compress::LZF;
35	use Digest::MD5 ();	36	use Digest::MD5 ();
36		37
37	# configure various modules to our taste	38	# configure various modules to our taste
38	#	39	#
39	$Storable::canonical = 1; # reduce rsync transfers	40	$Storable::canonical = 1; # reduce rsync transfers
40	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
41	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
42
43	$Event::Eval = 1; # no idea why this is required, but it is
44		43
45	# 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?
46	$YAML::Syck::ImplicitUnicode = 1;	45	$YAML::Syck::ImplicitUnicode = 1;
47		46
48	$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
…		…
70	our $TMPDIR = "$LOCALDIR/" . tmpdir;	69	our $TMPDIR = "$LOCALDIR/" . tmpdir;
71	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	70	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	71	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73	our $RANDOMDIR = "$LOCALDIR/random";	72	our $RANDOMDIR = "$LOCALDIR/random";
74	our $BDBDIR = "$LOCALDIR/db";	73	our $BDBDIR = "$LOCALDIR/db";
		74	our %RESOURCE;
75		75
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;	77	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;	78	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	80	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	81	our $USE_FSYNC = 1; # use fsync to write maps - default off
83		82
84	our $BDB_POLL_WATCHER;	83	our $BDB_POLL_WATCHER;
		84	our $BDB_DEADLOCK_WATCHER;
		85	our $BDB_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
85	our $DB_ENV;	87	our $DB_ENV;
86		88
87	our %CFG;	89	our %CFG;
88		90
89	our $UPTIME; $UPTIME ||= time;	91	our $UPTIME; $UPTIME ||= time;
90	our $RUNTIME;	92	our $RUNTIME;
		93	our $NOW;
91		94
92	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
93	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
94	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
95		98
96	# 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 ∕
97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98		101
…		…
159		162
160	The raw value load value from the last tick.	163	The raw value load value from the last tick.
161		164
162	=item %cf::CFG	165	=item %cf::CFG
163		166
164	Configuration for the server, loaded from C</etc/crossfire/config>, or	167	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165	from wherever your confdir points to.	168	from wherever your confdir points to.
166		169
167	=item cf::wait_for_tick, cf::wait_for_tick_begin	170	=item cf::wait_for_tick, cf::wait_for_tick_begin
168		171
169	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
…		…
187	$msg .= "\n"	190	$msg .= "\n"
188	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
189		192
190	$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;
191		194
192	utf8::encode $msg;
193	LOG llevError, $msg;	195	LOG llevError, $msg;
194	};	196	};
195	}	197	}
		198
		199	$Coro::State::DIEHOOK = sub {
		200	warn Carp::longmess $_[0];
		201	Coro::terminate;
		202	};
196		203
197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	204	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	205	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	206	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	207	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
…		…
213	)) {	220	)) {
214	no strict 'refs';	221	no strict 'refs';
215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	222	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216	}	223	}
217		224
218	$Event::DIED = sub {	225	$EV::DIED = sub {
219	warn "error in event callback: @_";	226	warn "error in event callback: @_";
220	};	227	};
221		228
222	#############################################################################	229	#############################################################################
223		230
…		…
246	$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;
247	$d	254	$d
248	} || "[unable to dump $_[0]: '$@']";	255	} || "[unable to dump $_[0]: '$@']";
249	}	256	}
250		257
251	=item $ref = cf::from_json $json	258	=item $ref = cf::decode_json $json
252		259
253	Converts a JSON string into the corresponding perl data structure.	260	Converts a JSON string into the corresponding perl data structure.
254		261
255	=item $json = cf::to_json $ref	262	=item $json = cf::encode_json $ref
256		263
257	Converts a perl data structure into its JSON representation.	264	Converts a perl data structure into its JSON representation.
258		265
259	=cut	266	=cut
260		267
261	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
262		269
263	sub to_json ($) { $json_coder->encode ($_[0]) }	270	sub encode_json($) { $json_coder->encode ($_[0]) }
264	sub from_json ($) { $json_coder->decode ($_[0]) }	271	sub decode_json($) { $json_coder->decode ($_[0]) }
265		272
266	=item cf::lock_wait $string	273	=item cf::lock_wait $string
267		274
268	Wait until the given lock is available. See cf::lock_acquire.	275	Wait until the given lock is available. See cf::lock_acquire.
269		276
…		…
272	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
273	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,
274	for example when the coroutine gets canceled), the lock is automatically	281	for example when the coroutine gets canceled), the lock is automatically
275	returned.	282	returned.
276		283
		284	Locks are *not* recursive, locking from the same coro twice results in a
		285	deadlocked coro.
		286
277	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
278	uses map_find and cf::map::load uses map_load).	288	uses map_find and cf::map::load uses map_load).
279		289
280	=item $locked = cf::lock_active $string	290	=item $locked = cf::lock_active $string
281		291
282	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.
283		293
284	=cut	294	=cut
285		295
286	our %LOCK;	296	our %LOCK;
		297	our %LOCKER;#d#
287		298
288	sub lock_wait($) {	299	sub lock_wait($) {
289	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#
290		306
291	# wait for lock, if any	307	# wait for lock, if any
292	while ($LOCK{$key}) {	308	while ($LOCK{$key}) {
293	push @{ $LOCK{$key} }, $Coro::current;	309	push @{ $LOCK{$key} }, $Coro::current;
294	Coro::schedule;	310	Coro::schedule;
…		…
300		316
301	# wait, to be sure we are not locked	317	# wait, to be sure we are not locked
302	lock_wait $key;	318	lock_wait $key;
303		319
304	$LOCK{$key} = [];	320	$LOCK{$key} = [];
		321	$LOCKER{$key} = $Coro::current;#d#
305		322
306	Coro::guard {	323	Coro::guard {
		324	delete $LOCKER{$key};#d#
307	# wake up all waiters, to be on the safe side	325	# wake up all waiters, to be on the safe side
308	$_->ready for @{ delete $LOCK{$key} };	326	$_->ready for @{ delete $LOCK{$key} };
309	}	327	}
310	}	328	}
311		329
…		…
323	};	341	};
324	$TICK_WATCHER->stop;	342	$TICK_WATCHER->stop;
325	$guard	343	$guard
326	}	344	}
327		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
328	=item cf::get_slot $time[, $priority[, $name]]	361	=item cf::get_slot $time[, $priority[, $name]]
329		362
330	Allocate $time seconds of blocking CPU time at priority C<$priority>:	363	Allocate $time seconds of blocking CPU time at priority C<$priority>:
331	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
332	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.
…		…
341	our @SLOT_QUEUE;	374	our @SLOT_QUEUE;
342	our $SLOT_QUEUE;	375	our $SLOT_QUEUE;
343		376
344	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	377	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345	$SLOT_QUEUE = Coro::async {	378	$SLOT_QUEUE = Coro::async {
		379	$Coro::current->desc ("timeslot manager");
		380
346	my $signal = new Coro::Signal;	381	my $signal = new Coro::Signal;
347		382
348	while () {	383	while () {
349	next_job:	384	next_job:
350	my $avail = cf::till_tick;	385	my $avail = cf::till_tick;
…		…
358	}	393	}
359	}	394	}
360	}	395	}
361		396
362	if (@SLOT_QUEUE) {	397	if (@SLOT_QUEUE) {
363	# 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
364	push @cf::WAIT_FOR_TICK, $signal;	399	push @cf::WAIT_FOR_TICK, $signal;
365	$signal->wait;	400	$signal->wait;
366	} else {	401	} else {
367	Coro::schedule;	402	Coro::schedule;
368	}	403	}
…		…
391		426
392	BEGIN { *async = \&Coro::async_pool }	427	BEGIN { *async = \&Coro::async_pool }
393		428
394	=item cf::sync_job { BLOCK }	429	=item cf::sync_job { BLOCK }
395		430
396	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	431	The design of Deliantra requires that the main coroutine ($Coro::main)
397	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
398	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
399	acceptable.	434	acceptable.
400		435
401	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
402	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
…		…
407		442
408	sub sync_job(&) {	443	sub sync_job(&) {
409	my ($job) = @_;	444	my ($job) = @_;
410		445
411	if ($Coro::current == $Coro::main) {	446	if ($Coro::current == $Coro::main) {
412	my $time = Event::time;	447	my $time = EV::time;
413		448
414	# this is the main coro, too bad, we have to block	449	# this is the main coro, too bad, we have to block
415	# till the operation succeeds, freezing the server :/	450	# till the operation succeeds, freezing the server :/
416		451
		452	LOG llevError, Carp::longmess "sync job";#d#
		453
417	# TODO: use suspend/resume instead	454	# TODO: use suspend/resume instead
418	# (but this is cancel-safe)	455	# (but this is cancel-safe)
419	my $freeze_guard = freeze_mainloop;	456	my $freeze_guard = freeze_mainloop;
420		457
421	my $busy = 1;	458	my $busy = 1;
422	my @res;	459	my @res;
423		460
424	(async {	461	(async {
		462	$Coro::current->desc ("sync job coro");
425	@res = eval { $job->() };	463	@res = eval { $job->() };
426	warn $@ if $@;	464	warn $@ if $@;
427	undef $busy;	465	undef $busy;
428	})->prio (Coro::PRIO_MAX);	466	})->prio (Coro::PRIO_MAX);
429		467
430	while ($busy) {	468	while ($busy) {
431	Coro::cede or Event::one_event;	469	if (Coro::nready) {
		470	Coro::cede_notself;
		471	} else {
		472	EV::loop EV::LOOP_ONESHOT;
432	}	473	}
		474	}
433		475
434	$time = Event::time - $time;	476	$time = EV::time - $time;
435		477
436	LOG llevError | logBacktrace, Carp::longmess "long sync job"	478	LOG llevError | logBacktrace, Carp::longmess "long sync job"
437	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	479	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438		480
439	$tick_start += $time; # do not account sync jobs to server load	481	$tick_start += $time; # do not account sync jobs to server load
…		…
469	=item fork_call { }, $args	511	=item fork_call { }, $args
470		512
471	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
472	process, returning the results. Everything must be serialisable with	514	process, returning the results. Everything must be serialisable with
473	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
474	never block itself or use any form of Event handling.	516	never block itself or use any form of event handling.
475		517
476	=cut	518	=cut
477		519
478	sub fork_call(&@) {	520	sub fork_call(&@) {
479	my ($cb, @args) = @_;	521	my ($cb, @args) = @_;
480		522
481	# we seemingly have to make a local copy of the whole thing,	523	# we seemingly have to make a local copy of the whole thing,
482	# otherwise perl prematurely frees the stuff :/	524	# otherwise perl prematurely frees the stuff :/
483	# TODO: investigate and fix (liekly this will be rather laborious)	525	# TODO: investigate and fix (likely this will be rather laborious)
484		526
485	my @res = Coro::Util::fork_eval {	527	my @res = Coro::Util::fork_eval {
486	reset_signals;	528	reset_signals;
487	&$cb	529	&$cb
488	}, @args;	530	}, @args;
…		…
497	=item cf::db_put $family => $key => $value	539	=item cf::db_put $family => $key => $value
498		540
499	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
500	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).
501		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
502	=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	}
503		567
504	our $DB;	568	our $DB;
505		569
506	sub db_init {	570	sub db_init {
507	unless ($DB) {
508	$DB = BDB::db_create $DB_ENV;
509
510	cf::sync_job {	571	cf::sync_job {
511	eval {	572	$DB ||= db_table "db";
512	$DB->set_flags (BDB::CHKSUM);
513
514	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516	cf::cleanup "db_open(db): $!" if $!;
517	};
518	cf::cleanup "db_open(db): $@" if $@;
519	};
520	}	573	};
521	}	574	}
522		575
523	sub db_get($$) {	576	sub db_get($$) {
524	my $key = "$_[0]/$_[1]";	577	my $key = "$_[0]/$_[1]";
525		578
…		…
575	if (1) {	628	if (1) {
576	$md5 =	629	$md5 =
577	join "\x00",	630	join "\x00",
578	$processversion,	631	$processversion,
579	map {	632	map {
580	Coro::cede;	633	cf::cede_to_tick;
581	($src->[$_], Digest::MD5::md5_hex $data[$_])	634	($src->[$_], Digest::MD5::md5_hex $data[$_])
582	} 0.. $#$src;	635	} 0.. $#$src;
583		636
584		637
585	my $dbmd5 = db_get cache => "$id/md5";	638	my $dbmd5 = db_get cache => "$id/md5";
…		…
629	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")
630	to it. All such attachable objects support the following methods.	683	to it. All such attachable objects support the following methods.
631		684
632	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>
633	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
634	Crossfire TRT).	687	Deliantra).
635		688
636	=over 4	689	=over 4
637		690
638	=item $attachable->attach ($attachment, key => $value...)	691	=item $attachable->attach ($attachment, key => $value...)
639		692
…		…
921	}	974	}
922		975
923	0	976	0
924	}	977	}
925		978
926	=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)	979	=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927		980
928	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)	981	=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929		982
930	Generate an object-specific event with the given arguments.	983	Generate an object-specific event with the given arguments.
931		984
…		…
937		990
938	=cut	991	=cut
939		992
940	#############################################################################	993	#############################################################################
941	# object support	994	# object support
942	#
943		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#
944	sub _can_merge {	1029	sub _can_merge {
945	my ($ob1, $ob2) = @_;	1030	my ($ob1, $ob2) = @_;
946		1031
947	local $Storable::canonical = 1;	1032	++$SLOW_MERGES;#d#
948	my $fob1 = Storable::freeze $ob1;
949	my $fob2 = Storable::freeze $ob2;
950		1033
951	$fob1 eq $fob2	1034	# we do the slow way here
		1035	return _object_equal $ob1, $ob2
952	}	1036	}
953		1037
954	sub reattach {	1038	sub reattach {
955	# basically do the same as instantiate, without calling instantiate	1039	# basically do the same as instantiate, without calling instantiate
956	my ($obj) = @_;	1040	my ($obj) = @_;
…		…
978	cf::attachable->attach (	1062	cf::attachable->attach (
979	prio => -1000000,	1063	prio => -1000000,
980	on_instantiate => sub {	1064	on_instantiate => sub {
981	my ($obj, $data) = @_;	1065	my ($obj, $data) = @_;
982		1066
983	$data = from_json $data;	1067	$data = decode_json $data;
984		1068
985	for (@$data) {	1069	for (@$data) {
986	my ($name, $args) = @$_;	1070	my ($name, $args) = @$_;
987		1071
988	$obj->attach ($name, %{$args || {} });	1072	$obj->attach ($name, %{$args || {} });
…		…
1004	sub object_freezer_save {	1088	sub object_freezer_save {
1005	my ($filename, $rdata, $objs) = @_;	1089	my ($filename, $rdata, $objs) = @_;
1006		1090
1007	sync_job {	1091	sync_job {
1008	if (length $$rdata) {	1092	if (length $$rdata) {
		1093	utf8::decode (my $decname = $filename);
1009	warn sprintf "saving %s (%d,%d)\n",	1094	warn sprintf "saving %s (%d,%d)\n",
1010	$filename, length $$rdata, scalar @$objs;	1095	$decname, length $$rdata, scalar @$objs;
1011		1096
1012	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1097	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013	chmod SAVE_MODE, $fh;	1098	chmod SAVE_MODE, $fh;
1014	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1099	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015	aio_fsync $fh if $cf::USE_FSYNC;	1100	aio_fsync $fh if $cf::USE_FSYNC;
1016	close $fh;	1101	close $fh;
1017		1102
1018	if (@$objs) {	1103	if (@$objs) {
1019	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) {
1020	chmod SAVE_MODE, $fh;	1105	chmod SAVE_MODE, $fh;
1021	my $data = Storable::nfreeze { version => 1, objs => $objs };	1106	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022	aio_write $fh, 0, (length $data), $data, 0;	1107	aio_write $fh, 0, (length $data), $data, 0;
1023	aio_fsync $fh if $cf::USE_FSYNC;	1108	aio_fsync $fh if $cf::USE_FSYNC;
1024	close $fh;	1109	close $fh;
1025	aio_rename "$filename.pst~", "$filename.pst";	1110	aio_rename "$filename.pst~", "$filename.pst";
1026	}	1111	}
…		…
1034	}	1119	}
1035	} else {	1120	} else {
1036	aio_unlink $filename;	1121	aio_unlink $filename;
1037	aio_unlink "$filename.pst";	1122	aio_unlink "$filename.pst";
1038	}	1123	}
1039	}	1124	};
1040	}	1125	}
1041		1126
1042	sub object_freezer_as_string {	1127	sub object_freezer_as_string {
1043	my ($rdata, $objs) = @_;	1128	my ($rdata, $objs) = @_;
1044		1129
…		…
1056	or return;	1141	or return;
1057		1142
1058	unless (aio_stat "$filename.pst") {	1143	unless (aio_stat "$filename.pst") {
1059	(aio_load "$filename.pst", $av) >= 0	1144	(aio_load "$filename.pst", $av) >= 0
1060	or return;	1145	or return;
		1146
1061	$av = eval { (Storable::thaw $av)->{objs} };	1147	my $st = eval { Coro::Storable::thaw $av };
		1148	$av = $st->{objs};
1062	}	1149	}
1063		1150
		1151	utf8::decode (my $decname = $filename);
1064	warn sprintf "loading %s (%d)\n",	1152	warn sprintf "loading %s (%d,%d)\n",
1065	$filename, length $data, scalar @{$av || []};	1153	$decname, length $data, scalar @{$av || []};
		1154
1066	return ($data, $av);	1155	($data, $av)
1067	}	1156	}
1068		1157
1069	=head2 COMMAND CALLBACKS	1158	=head2 COMMAND CALLBACKS
1070		1159
1071	=over 4	1160	=over 4
…		…
1149	my ($type, $reply, @payload) =	1238	my ($type, $reply, @payload) =
1150	"ARRAY" eq ref $msg	1239	"ARRAY" eq ref $msg
1151	? @$msg	1240	? @$msg
1152	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	1241	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153		1242
		1243	my @reply;
		1244
1154	if (my $cb = $EXTCMD{$type}) {	1245	if (my $cb = $EXTCMD{$type}) {
1155	my @reply = $cb->($pl, @payload);	1246	@reply = $cb->($pl, @payload);
1156
1157	$pl->ext_reply ($reply, @reply)
1158	if $reply;
1159	}	1247	}
		1248
		1249	$pl->ext_reply ($reply, @reply)
		1250	if $reply;
		1251
1160	} else {	1252	} else {
1161	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1253	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162	}	1254	}
1163		1255
1164	cf::override;	1256	cf::override;
…		…
1254		1346
1255	=head3 cf::player	1347	=head3 cf::player
1256		1348
1257	=over 4	1349	=over 4
1258		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
1259	=item cf::player::find $login	1365	=item cf::player::find $login
1260		1366
1261	Returns the given player object, loading it if necessary (might block).	1367	Returns the given player object, loading it if necessary (might block).
1262		1368
1263	=cut	1369	=cut
…		…
1298	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1404	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1405	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1406	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301	aio_unlink +(playerdir $login) . "/$login.pl";	1407	aio_unlink +(playerdir $login) . "/$login.pl";
1302		1408
1303	my $pl = load_pl path $login	1409	my $f = new_from_file cf::object::thawer path $login
1304	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;
1305	$cf::PLAYER{$login} = $pl	1416	$cf::PLAYER{$login} = $pl
1306	}	1417	}
1307	}	1418	}
1308	}	1419	}
1309		1420
…		…
1319		1430
1320	aio_mkdir playerdir $pl, 0770;	1431	aio_mkdir playerdir $pl, 0770;
1321	$pl->{last_save} = $cf::RUNTIME;	1432	$pl->{last_save} = $cf::RUNTIME;
1322		1433
1323	$pl->save_pl ($path);	1434	$pl->save_pl ($path);
1324	Coro::cede;	1435	cf::cede_to_tick;
1325	}	1436	}
1326		1437
1327	sub new($) {	1438	sub new($) {
1328	my ($login) = @_;	1439	my ($login) = @_;
1329		1440
…		…
1407	or return [];	1518	or return [];
1408		1519
1409	my @logins;	1520	my @logins;
1410		1521
1411	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") {
1412	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1527	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413	aio_read $fh, 0, 512, my $buf, 0 or next;	1528	aio_read $fh, 0, 512, my $buf, 0 or next;
1414	$buf !~ /^password -------------$/m or next; # official not-valid tag	1529	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1530	}
1415		1531
1416	utf8::decode $login;	1532	utf8::decode $login;
1417	push @logins, $login;	1533	push @logins, $login;
1418	}	1534	}
1419		1535
…		…
1452		1568
1453	Expand crossfire pod fragments into protocol xml.	1569	Expand crossfire pod fragments into protocol xml.
1454		1570
1455	=cut	1571	=cut
1456		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
1457	sub expand_cfpod {	1584	sub expand_cfpod {
1458	((my $self), (local $_)) = @_;	1585	my ($self, $pod) = @_;
1459		1586
1460	# escape & and <	1587	my $xml;
1461	s/&/&amp;/g;
1462	s/(?<![BIUGH])</&lt;/g;
1463		1588
1464	# this is buggy, it needs to properly take care of nested <'s	1589	while () {
		1590	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1591	$group = $1;
1465		1592
1466	1 while	1593	$group =~ s/&/&amp;/g;
1467	# replace B<>, I<>, U<> etc.	1594	$group =~ s/</&lt;/g;
1468	s/B<([^\>]*)>/<b>$1<\/b>/	1595
1469	|| s/I<([^\>]*)>/<i>$1<\/i>/	1596	$xml .= $group;
1470	|| s/U<([^\>]*)>/<u>$1<\/u>/	1597	} elsif ($pod =~ m%\G
1471	# replace G<male|female> tags	1598	([BCGHITU])
1472	|| s{G<([^>|]*)\|([^>]*)>}{	1599	<
1473	$self->gender ? $2 : $1	1600	(?:
1474	}ge	1601	([^<>]*) (?{ $group = $^N })
1475	# replace H<hint text>	1602	| < $interior >
1476	|| s{H<([^\>]*)>}	1603	)
		1604	>
		1605	%gcsx
1477	{	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") {
1478	("<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>",
1479	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1625	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480	"")	1626	"")
1481	[$self->{hintmode}]	1627	[$self->{hintmode}];
		1628	} else {
		1629	$xml .= "error processing '$code($data)' directive";
1482	}ge;	1630	}
		1631	} else {
		1632	if ($pod =~ /\G(.+)/) {
		1633	warn "parse error while expanding $pod (at $1)";
		1634	}
		1635	last;
		1636	}
		1637	}
1483		1638
		1639	for ($xml) {
1484	# create single paragraphs (very hackish)	1640	# create single paragraphs (very hackish)
1485	s/(?<=\S)\n(?=\w)/ /g;	1641	s/(?<=\S)\n(?=\w)/ /g;
1486		1642
1487	# compress some whitespace	1643	# compress some whitespace
1488	s/\s+\n/\n/g; # ws line-ends	1644	s/\s+\n/\n/g; # ws line-ends
1489	s/\n\n+/\n/g; # double lines	1645	s/\n\n+/\n/g; # double lines
1490	s/^\n+//; # beginning lines	1646	s/^\n+//; # beginning lines
1491	s/\n+$//; # ending lines	1647	s/\n+$//; # ending lines
		1648	}
1492		1649
1493	$_	1650	$xml
1494	}	1651	}
		1652
		1653	no re 'eval';
1495		1654
1496	sub hintmode {	1655	sub hintmode {
1497	$_[0]{hintmode} = $_[1] if @_ > 1;	1656	$_[0]{hintmode} = $_[1] if @_ > 1;
1498	$_[0]{hintmode}	1657	$_[0]{hintmode}
1499	}	1658	}
…		…
1505	=cut	1664	=cut
1506		1665
1507	sub ext_reply($$@) {	1666	sub ext_reply($$@) {
1508	my ($self, $id, @msg) = @_;	1667	my ($self, $id, @msg) = @_;
1509		1668
1510	if ($self->ns->extcmd == 2) {	1669	$self->ns->ext_reply ($id, @msg)
1511	$self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512	} elsif ($self->ns->extcmd == 1) {
1513	#TODO: version 1, remove
1514	unshift @msg, msgtype => "reply", msgid => $id;
1515	$self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516	}
1517	}	1670	}
1518		1671
1519	=item $player->ext_msg ($type, @msg)	1672	=item $player->ext_msg ($type, @msg)
1520		1673
1521	Sends an ext event to the client.	1674	Sends an ext event to the client.
…		…
1749		1902
1750	sub load_header_from($) {	1903	sub load_header_from($) {
1751	my ($self, $path) = @_;	1904	my ($self, $path) = @_;
1752		1905
1753	utf8::encode $path;	1906	utf8::encode $path;
1754	#aio_open $path, O_RDONLY, 0	1907	my $f = new_from_file cf::object::thawer $path
1755	# or return;
1756
1757	$self->_load_header ($path)
1758	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;
1759		1915
1760	$self->{load_path} = $path;	1916	$self->{load_path} = $path;
1761		1917
1762	1	1918	1
1763	}	1919	}
…		…
1817	sub find {	1973	sub find {
1818	my ($path, $origin) = @_;	1974	my ($path, $origin) = @_;
1819		1975
1820	$path = normalise $path, $origin && $origin->path;	1976	$path = normalise $path, $origin && $origin->path;
1821		1977
		1978	cf::lock_wait "map_data:$path";#d#remove
1822	cf::lock_wait "map_find:$path";	1979	cf::lock_wait "map_find:$path";
1823		1980
1824	$cf::MAP{$path} || do {	1981	$cf::MAP{$path} || do {
1825	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
1826	my $map = new_from_path cf::map $path	1985	my $map = new_from_path cf::map $path
1827	or return;	1986	or return;
1828		1987
1829	$map->{last_save} = $cf::RUNTIME;	1988	$map->{last_save} = $cf::RUNTIME;
1830		1989
…		…
1832	or return;	1991	or return;
1833		1992
1834	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1993	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835	# doing this can freeze the server in a sync job, obviously	1994	# doing this can freeze the server in a sync job, obviously
1836	#$cf::WAIT_FOR_TICK->wait;	1995	#$cf::WAIT_FOR_TICK->wait;
		1996	undef $guard1;
		1997	undef $guard2;
1837	$map->reset;	1998	$map->reset;
1838	undef $guard;
1839	return find $path;	1999	return find $path;
1840	}	2000	}
1841		2001
1842	$cf::MAP{$path} = $map	2002	$cf::MAP{$path} = $map
1843	}	2003	}
…		…
1852	local $self->{deny_reset} = 1; # loading can take a long time	2012	local $self->{deny_reset} = 1; # loading can take a long time
1853		2013
1854	my $path = $self->{path};	2014	my $path = $self->{path};
1855		2015
1856	{	2016	{
1857	my $guard = cf::lock_acquire "map_load:$path";	2017	my $guard = cf::lock_acquire "map_data:$path";
1858		2018
		2019	return unless $self->valid;
1859	return if $self->in_memory != cf::MAP_SWAPPED;	2020	return unless $self->in_memory == cf::MAP_SWAPPED;
1860		2021
1861	$self->in_memory (cf::MAP_LOADING);	2022	$self->in_memory (cf::MAP_LOADING);
1862		2023
1863	$self->alloc;	2024	$self->alloc;
1864		2025
1865	$self->pre_load;	2026	$self->pre_load;
1866	Coro::cede;	2027	cf::cede_to_tick;
1867		2028
		2029	my $f = new_from_file cf::object::thawer $self->{load_path};
		2030	$f->skip_block;
1868	$self->_load_objects ($self->{load_path}, 1)	2031	$self->_load_objects ($f)
1869	or return;	2032	or return;
1870		2033
1871	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2034	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872	if delete $self->{load_original};	2035	if delete $self->{load_original};
1873		2036
1874	if (my $uniq = $self->uniq_path) {	2037	if (my $uniq = $self->uniq_path) {
1875	utf8::encode $uniq;	2038	utf8::encode $uniq;
1876	if (aio_open $uniq, O_RDONLY, 0) {	2039	unless (aio_stat $uniq) {
		2040	if (my $f = new_from_file cf::object::thawer $uniq) {
1877	$self->clear_unique_items;	2041	$self->clear_unique_items;
1878	$self->_load_objects ($uniq, 0);	2042	$self->_load_objects ($f);
		2043	$f->resolve_delayed_derefs;
		2044	}
1879	}	2045	}
1880	}	2046	}
1881		2047
1882	Coro::cede;	2048	$f->resolve_delayed_derefs;
		2049
		2050	cf::cede_to_tick;
1883	# now do the right thing for maps	2051	# now do the right thing for maps
1884	$self->link_multipart_objects;	2052	$self->link_multipart_objects;
1885	$self->difficulty ($self->estimate_difficulty)	2053	$self->difficulty ($self->estimate_difficulty)
1886	unless $self->difficulty;	2054	unless $self->difficulty;
1887	Coro::cede;	2055	cf::cede_to_tick;
1888		2056
1889	unless ($self->{deny_activate}) {	2057	unless ($self->{deny_activate}) {
1890	$self->decay_objects;	2058	$self->decay_objects;
1891	$self->fix_auto_apply;	2059	$self->fix_auto_apply;
1892	$self->update_buttons;	2060	$self->update_buttons;
1893	Coro::cede;	2061	cf::cede_to_tick;
1894	$self->set_darkness_map;	2062	$self->set_darkness_map;
1895	Coro::cede;	2063	cf::cede_to_tick;
1896	$self->activate;	2064	$self->activate;
1897	}	2065	}
1898		2066
1899	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1900	$self->last_access ($cf::RUNTIME);	2068	$self->last_access ($cf::RUNTIME);
…		…
1916		2084
1917	$self	2085	$self
1918	}	2086	}
1919		2087
1920	# 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
1921	sub load_diag {	2089	sub load_neighbours {
1922	my ($map) = @_;	2090	my ($map) = @_;
1923		2091
1924	my @diag; # diagonal neighbours	2092	my @neigh; # diagonal neighbours
1925		2093
1926	for (0 .. 3) {	2094	for (0 .. 3) {
1927	my $neigh = $map->tile_path ($_)	2095	my $neigh = $map->tile_path ($_)
1928	or next;	2096	or next;
1929	$neigh = find $neigh, $map	2097	$neigh = find $neigh, $map
1930	or next;	2098	or next;
1931	$neigh->load;	2099	$neigh->load;
1932		2100
		2101	push @neigh,
1933	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2102	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1934	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2103	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1935	}	2104	}
1936		2105
1937	for (@diag) {	2106	for (grep defined $_->[0], @neigh) {
		2107	my ($path, $origin) = @$_;
1938	my $neigh = find @$_	2108	my $neigh = find $path, $origin
1939	or next;	2109	or next;
1940	$neigh->load;	2110	$neigh->load;
1941	}	2111	}
1942	}	2112	}
1943		2113
…		…
1948	}	2118	}
1949		2119
1950	sub do_load_sync {	2120	sub do_load_sync {
1951	my ($map) = @_;	2121	my ($map) = @_;
1952		2122
		2123	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2124	if $Coro::current == $Coro::main;
		2125
1953	cf::sync_job { $map->load };	2126	cf::sync_job { $map->load };
1954	}	2127	}
1955		2128
1956	our %MAP_PREFETCH;	2129	our %MAP_PREFETCH;
1957	our $MAP_PREFETCHER = undef;	2130	our $MAP_PREFETCHER = undef;
1958		2131
1959	sub find_async {	2132	sub find_async {
1960	my ($path, $origin) = @_;	2133	my ($path, $origin, $load) = @_;
1961		2134
1962	$path = normalise $path, $origin && $origin->{path};	2135	$path = normalise $path, $origin && $origin->{path};
1963		2136
1964	if (my $map = $cf::MAP{$path}) {	2137	if (my $map = $cf::MAP{$path}) {
1965	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2138	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966	}	2139	}
1967		2140
1968	undef $MAP_PREFETCH{$path};	2141	$MAP_PREFETCH{$path} |= $load;
		2142
1969	$MAP_PREFETCHER ||= cf::async {	2143	$MAP_PREFETCHER ||= cf::async {
		2144	$Coro::current->{desc} = "map prefetcher";
		2145
1970	while (%MAP_PREFETCH) {	2146	while (%MAP_PREFETCH) {
1971	for my $path (keys %MAP_PREFETCH) {	2147	while (my ($k, $v) = each %MAP_PREFETCH) {
1972	if (my $map = find $path) {	2148	if (my $map = find $k) {
1973	$map->load;	2149	$map->load if $v;
1974	}	2150	}
1975		2151
1976	delete $MAP_PREFETCH{$path};	2152	delete $MAP_PREFETCH{$k};
1977	}	2153	}
1978	}	2154	}
1979	undef $MAP_PREFETCHER;	2155	undef $MAP_PREFETCHER;
1980	};	2156	};
1981	$MAP_PREFETCHER->prio (6);	2157	$MAP_PREFETCHER->prio (6);
…		…
1984	}	2160	}
1985		2161
1986	sub save {	2162	sub save {
1987	my ($self) = @_;	2163	my ($self) = @_;
1988		2164
1989	my $lock = cf::lock_acquire "map_data:" . $self->path;	2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
1990		2166
1991	$self->{last_save} = $cf::RUNTIME;	2167	$self->{last_save} = $cf::RUNTIME;
1992		2168
1993	return unless $self->dirty;	2169	return unless $self->dirty;
1994		2170
…		…
2000	return if $self->{deny_save};	2176	return if $self->{deny_save};
2001		2177
2002	local $self->{last_access} = $self->last_access;#d#	2178	local $self->{last_access} = $self->last_access;#d#
2003		2179
2004	cf::async {	2180	cf::async {
		2181	$Coro::current->{desc} = "map player save";
2005	$_->contr->save for $self->players;	2182	$_->contr->save for $self->players;
2006	};	2183	};
2007		2184
2008	if ($uniq) {	2185	if ($uniq) {
2009	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2186	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
2017	my ($self) = @_;	2194	my ($self) = @_;
2018		2195
2019	# save first because save cedes	2196	# save first because save cedes
2020	$self->save;	2197	$self->save;
2021		2198
2022	my $lock = cf::lock_acquire "map_data:" . $self->path;	2199	my $lock = cf::lock_acquire "map_data:$self->{path}";
2023		2200
2024	return if $self->players;	2201	return if $self->players;
2025	return if $self->in_memory != cf::MAP_IN_MEMORY;	2202	return if $self->in_memory != cf::MAP_IN_MEMORY;
2026	return if $self->{deny_save};	2203	return if $self->{deny_save};
2027		2204
		2205	$self->in_memory (cf::MAP_SWAPPED);
		2206
		2207	$self->deactivate;
		2208	$_->clear_links_to ($self) for values %cf::MAP;
2028	$self->clear;	2209	$self->clear;
2029	$self->in_memory (cf::MAP_SWAPPED);
2030	}	2210	}
2031		2211
2032	sub reset_at {	2212	sub reset_at {
2033	my ($self) = @_;	2213	my ($self) = @_;
2034		2214
…		…
2066	if $uniq;	2246	if $uniq;
2067	}	2247	}
2068		2248
2069	delete $cf::MAP{$self->path};	2249	delete $cf::MAP{$self->path};
2070		2250
		2251	$self->deactivate;
		2252	$_->clear_links_to ($self) for values %cf::MAP;
2071	$self->clear;	2253	$self->clear;
2072
2073	$_->clear_links_to ($self) for values %cf::MAP;
2074		2254
2075	$self->unlink_save;	2255	$self->unlink_save;
2076	$self->destroy;	2256	$self->destroy;
2077	}	2257	}
2078		2258
2079	my $nuke_counter = "aaaa";	2259	my $nuke_counter = "aaaa";
2080		2260
2081	sub nuke {	2261	sub nuke {
2082	my ($self) = @_;	2262	my ($self) = @_;
2083		2263
		2264	{
		2265	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2266
2084	delete $cf::MAP{$self->path};	2267	delete $cf::MAP{$self->path};
2085		2268
2086	$self->unlink_save;	2269	$self->unlink_save;
2087		2270
2088	bless $self, "cf::map";	2271	bless $self, "cf::map";
2089	delete $self->{deny_reset};	2272	delete $self->{deny_reset};
2090	$self->{deny_save} = 1;	2273	$self->{deny_save} = 1;
2091	$self->reset_timeout (1);	2274	$self->reset_timeout (1);
2092	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2275	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093		2276
2094	$cf::MAP{$self->path} = $self;	2277	$cf::MAP{$self->path} = $self;
		2278	}
2095		2279
2096	$self->reset; # polite request, might not happen	2280	$self->reset; # polite request, might not happen
2097	}	2281	}
2098		2282
2099	=item $maps = cf::map::tmp_maps	2283	=item $maps = cf::map::tmp_maps
…		…
2175		2359
2176	sub inv_recursive {	2360	sub inv_recursive {
2177	inv_recursive_ inv $_[0]	2361	inv_recursive_ inv $_[0]
2178	}	2362	}
2179		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
2180	package cf;	2392	package cf;
2181		2393
2182	=back	2394	=back
2183		2395
2184	=head3 cf::object::player	2396	=head3 cf::object::player
…		…
2312	# use -1 or undef as default coordinates, not 0, 0	2524	# use -1 or undef as default coordinates, not 0, 0
2313	($x, $y) = ($map->enter_x, $map->enter_y)	2525	($x, $y) = ($map->enter_x, $map->enter_y)
2314	if $x <=0 && $y <= 0;	2526	if $x <=0 && $y <= 0;
2315		2527
2316	$map->load;	2528	$map->load;
2317	$map->load_diag;	2529	$map->load_neighbours;
2318		2530
2319	return unless $self->contr->active;	2531	return unless $self->contr->active;
2320	$self->activate_recursive;	2532	$self->activate_recursive;
2321		2533
2322	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2534	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2342	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2554	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343		2555
2344	$self->enter_link;	2556	$self->enter_link;
2345		2557
2346	(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
2347	my $map = eval {	2580	my $map = eval {
2348	my $map = cf::map::find $path;	2581	my $map = defined $path ? cf::map::find $path : undef;
2349		2582
2350	if ($map) {	2583	if ($map) {
2351	$map = $map->customise_for ($self);	2584	$map = $map->customise_for ($self);
2352	$map = $check->($map) if $check && $map;	2585	$map = $check->($map) if $check && $map;
2353	} else {	2586	} else {
2354	$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);
2355	}	2588	}
2356		2589
2357	$map	2590	$map
2358	};	2591	};
2359		2592
…		…
2412	$rmp->{origin_y} = $exit->y;	2645	$rmp->{origin_y} = $exit->y;
2413	}	2646	}
2414		2647
2415	$rmp->{random_seed} ||= $exit->random_seed;	2648	$rmp->{random_seed} ||= $exit->random_seed;
2416		2649
2417	my $data = cf::to_json $rmp;	2650	my $data = cf::encode_json $rmp;
2418	my $md5 = Digest::MD5::md5_hex $data;	2651	my $md5 = Digest::MD5::md5_hex $data;
2419	my $meta = "$RANDOMDIR/$md5.meta";	2652	my $meta = "$RANDOMDIR/$md5.meta";
2420		2653
2421	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2654	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2422	aio_write $fh, 0, (length $data), $data, 0;	2655	aio_write $fh, 0, (length $data), $data, 0;
…		…
2449	# if exit is damned, update players death & WoR home-position	2682	# if exit is damned, update players death & WoR home-position
2450	$self->contr->savebed ($slaying, $hp, $sp)	2683	$self->contr->savebed ($slaying, $hp, $sp)
2451	if $exit->flag (FLAG_DAMNED);	2684	if $exit->flag (FLAG_DAMNED);
2452		2685
2453	(async {	2686	(async {
		2687	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2688
2454	$self->deactivate_recursive; # just to be sure	2689	$self->deactivate_recursive; # just to be sure
2455	unless (eval {	2690	unless (eval {
2456	$self->goto ($slaying, $hp, $sp);	2691	$self->goto ($slaying, $hp, $sp);
2457		2692
2458	1;	2693	1;
…		…
2493	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
2494	the message unless the client supports the msg packet.	2729	the message unless the client supports the msg packet.
2495		2730
2496	=cut	2731	=cut
2497		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
2498	sub cf::client::send_msg {	2785	sub cf::client::send_msg {
2499	my ($self, $channel, $msg, $color, @extra) = @_;	2786	my ($self, $channel, $msg, $color, @extra) = @_;
2500		2787
2501	$msg = $self->pl->expand_cfpod ($msg);	2788	$msg = $self->pl->expand_cfpod ($msg);
2502		2789
2503	$color &= cf::NDI_CLIENT_MASK; # just in case...	2790	$color &= cf::NDI_CLIENT_MASK; # just in case...
2504		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
2505	if (ref $channel) {	2801	} elsif (ref $channel) {
2506	# send meta info to client, if not yet sent	2802	# send meta info to client, if not yet sent
2507	unless (exists $self->{channel}{$channel->{id}}) {	2803	unless (exists $self->{channel}{$channel->{id}}) {
2508	$self->{channel}{$channel->{id}} = $channel;	2804	$self->{channel}{$channel->{id}} = $channel;
2509	$self->ext_msg (channel_info => $channel);	2805	$self->ext_msg (channel_info => $channel)
		2806	if $self->can_msg;
2510	}	2807	}
2511		2808
2512	$channel = $channel->{id};	2809	$channel = $channel->{id};
2513	}	2810	}
2514		2811
…		…
2555	=cut	2852	=cut
2556		2853
2557	sub cf::client::ext_msg($$@) {	2854	sub cf::client::ext_msg($$@) {
2558	my ($self, $type, @msg) = @_;	2855	my ($self, $type, @msg) = @_;
2559		2856
2560	my $extcmd = $self->extcmd;
2561
2562	if ($extcmd == 2) {	2857	if ($self->extcmd == 2) {
2563	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	2858	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564	} elsif ($extcmd == 1) { # TODO: remove	2859	} elsif ($self->extcmd == 1) { # TODO: remove
2565	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;
2566	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2879	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567	}	2880	}
2568	}	2881	}
2569		2882
2570	=item $success = $client->query ($flags, "text", \&cb)	2883	=item $success = $client->query ($flags, "text", \&cb)
…		…
2632	my ($type, $reply, @payload) =	2945	my ($type, $reply, @payload) =
2633	"ARRAY" eq ref $msg	2946	"ARRAY" eq ref $msg
2634	? @$msg	2947	? @$msg
2635	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	2948	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636		2949
		2950	my @reply;
		2951
2637	if (my $cb = $EXTICMD{$type}) {	2952	if (my $cb = $EXTICMD{$type}) {
2638	my @reply = $cb->($ns, @payload);	2953	@reply = $cb->($ns, @payload);
2639
2640	$ns->ext_reply ($reply, @reply)
2641	if $reply;
2642	}	2954	}
		2955
		2956	$ns->ext_reply ($reply, @reply)
		2957	if $reply;
		2958
2643	} else {	2959	} else {
2644	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";
2645	}	2961	}
2646		2962
2647	cf::override;	2963	cf::override;
…		…
2707	=pod	3023	=pod
2708		3024
2709	The following functions and methods are available within a safe environment:	3025	The following functions and methods are available within a safe environment:
2710		3026
2711	cf::object	3027	cf::object
2712	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
2713	insert remove name archname title slaying race	3029	insert remove name archname title slaying race decrease_ob_nr
2714		3030
2715	cf::object::player	3031	cf::object::player
2716	player	3032	player
2717		3033
2718	cf::player	3034	cf::player
…		…
2723		3039
2724	=cut	3040	=cut
2725		3041
2726	for (	3042	for (
2727	["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
2728	insert remove inv name archname title slaying race)],	3044	insert remove inv name archname title slaying race
		3045	decrease_ob_nr destroy)],
2729	["cf::object::player" => qw(player)],	3046	["cf::object::player" => qw(player)],
2730	["cf::player" => qw(peaceful)],	3047	["cf::player" => qw(peaceful)],
2731	["cf::map" => qw(trigger)],	3048	["cf::map" => qw(trigger)],
2732	) {	3049	) {
2733	no strict 'refs';	3050	no strict 'refs';
…		…
2809	# the server's init and main functions	3126	# the server's init and main functions
2810		3127
2811	sub load_facedata($) {	3128	sub load_facedata($) {
2812	my ($path) = @_;	3129	my ($path) = @_;
2813		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
2814	warn "loading facedata from $path\n";	3137	warn "loading facedata from $path\n";
2815		3138
2816	my $facedata;	3139	my $facedata;
2817	0 < aio_load $path, $facedata	3140	0 < aio_load $path, $facedata
2818	or die "$path: $!";	3141	or die "$path: $!";
…		…
2820	$facedata = Coro::Storable::thaw $facedata;	3143	$facedata = Coro::Storable::thaw $facedata;
2821		3144
2822	$facedata->{version} == 2	3145	$facedata->{version} == 2
2823	or cf::cleanup "$path: version mismatch, cannot proceed.";	3146	or cf::cleanup "$path: version mismatch, cannot proceed.";
2824		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
2825	{	3155	{
2826	my $faces = $facedata->{faceinfo};	3156	my $faces = $facedata->{faceinfo};
2827		3157
2828	while (my ($face, $info) = each %$faces) {	3158	while (my ($face, $info) = each %$faces) {
2829	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3159	my $idx = (cf::face::find $face) || cf::face::alloc $face;
		3160
2830	cf::face::set_visibility $idx, $info->{visibility};	3161	cf::face::set_visibility $idx, $info->{visibility};
2831	cf::face::set_magicmap $idx, $info->{magicmap};	3162	cf::face::set_magicmap $idx, $info->{magicmap};
2832	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3163	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3164	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834		3165
2835	cf::cede_to_tick;	3166	cf::cede_to_tick;
2836	}	3167	}
2837		3168
2838	while (my ($face, $info) = each %$faces) {	3169	while (my ($face, $info) = each %$faces) {
2839	next unless $info->{smooth};	3170	next unless $info->{smooth};
		3171
2840	my $idx = cf::face::find $face	3172	my $idx = cf::face::find $face
2841	or next;	3173	or next;
		3174
2842	if (my $smooth = cf::face::find $info->{smooth}) {	3175	if (my $smooth = cf::face::find $info->{smooth}) {
2843	cf::face::set_smooth $idx, $smooth;	3176	cf::face::set_smooth $idx, $smooth;
2844	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3177	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845	} else {	3178	} else {
2846	warn "smooth face '$info->{smooth}' not found for face '$face'";	3179	warn "smooth face '$info->{smooth}' not found for face '$face'";
…		…
2863		3196
2864	{	3197	{
2865	# TODO: for gcfclient pleasure, we should give resources	3198	# TODO: for gcfclient pleasure, we should give resources
2866	# that gcfclient doesn't grok a >10000 face index.	3199	# that gcfclient doesn't grok a >10000 face index.
2867	my $res = $facedata->{resource};	3200	my $res = $facedata->{resource};
2868	my $enc = JSON::XS->new->utf8->canonical;
2869
2870	my $soundconf = delete $res->{"res/sound.conf"};
2871		3201
2872	while (my ($name, $info) = each %$res) {	3202	while (my ($name, $info) = each %$res) {
2873	my $meta = $enc->encode ({	3203	if (defined $info->{type}) {
2874	name => $name,
2875	%{ $info->{meta} || {} },
2876	});
2877
2878	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3204	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3205	my $data;
2879		3206
2880	if ($info->{type} & 1) {	3207	if ($info->{type} & 1) {
2881	# prepend meta info	3208	# prepend meta info
2882		3209
		3210	my $meta = $enc->encode ({
		3211	name => $name,
		3212	%{ $info->{meta} || {} },
		3213	});
		3214
2883	my $data = pack "(w/a*)*", $meta, $info->{data};	3215	$data = pack "(w/a*)*", $meta, $info->{data};
2884	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata	3216	} else {
		3217	$data = $info->{data};
		3218	}
2885		3219
2886	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};
2887	} else {	3222	} else {
2888	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};	3223	$RESOURCE{$name} = $info;
2889	}	3224	}
2890		3225
2891	cf::face::set_type $idx, $info->{type};
2892
2893	cf::cede_to_tick;	3226	cf::cede_to_tick;
2894	}	3227	}
2895
2896	if ($soundconf) {
2897	$soundconf = $enc->decode (delete $soundconf->{data});
2898
2899	for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900	my $sound = $soundconf->{compat}[$_]
2901	or next;
2902
2903	my $face = cf::face::find "sound/$sound->[1]";
2904	cf::sound::set $sound->[0] => $face;
2905	cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906	}
2907
2908	while (my ($k, $v) = each %{$soundconf->{event}}) {
2909	my $face = cf::face::find "sound/$v";
2910	cf::sound::set $k => $face;
2911	}
2912	}
2913	}	3228	}
		3229
		3230	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2914		3231
2915	1	3232	1
2916	}	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	});
2917		3254
2918	register_exticmd fx_want => sub {	3255	register_exticmd fx_want => sub {
2919	my ($ns, $want) = @_;	3256	my ($ns, $want) = @_;
2920		3257
2921	while (my ($k, $v) = each %$want) {	3258	while (my ($k, $v) = each %$want) {
2922	$ns->fx_want ($k, $v);	3259	$ns->fx_want ($k, $v);
2923	}	3260	}
2924	};	3261	};
2925		3262
2926	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
2927	load_resource_file "$MAPDIR/regions"	3268	load_resource_file "$MAPDIR/regions"
2928	or die "unable to load regions file\n";	3269	or die "unable to load regions file\n";
2929		3270
2930	for (cf::region::list) {	3271	for (cf::region::list) {
2931	$_->{match} = qr/$_->{match}/	3272	$_->{match} = qr/$_->{match}/
…		…
2967		3308
2968	sub init {	3309	sub init {
2969	reload_resources;	3310	reload_resources;
2970	}	3311	}
2971		3312
2972	sub cfg_load {	3313	sub reload_config {
2973	open my $fh, "<:utf8", "$CONFDIR/config"	3314	open my $fh, "<:utf8", "$CONFDIR/config"
2974	or return;	3315	or return;
2975		3316
2976	local $/;	3317	local $/;
2977	*CFG = YAML::Syck::Load <$fh>;	3318	*CFG = YAML::Syck::Load <$fh>;
…		…
2993	sub main {	3334	sub main {
2994	# we must not ever block the main coroutine	3335	# we must not ever block the main coroutine
2995	local $Coro::idle = sub {	3336	local $Coro::idle = sub {
2996	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#
2997	(async {	3338	(async {
2998	Event::one_event;	3339	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3340	EV::loop EV::LOOP_ONESHOT;
2999	})->prio (Coro::PRIO_MAX);	3341	})->prio (Coro::PRIO_MAX);
3000	};	3342	};
3001		3343
3002	cfg_load;	3344	reload_config;
3003	db_init;	3345	db_init;
3004	load_extensions;	3346	load_extensions;
3005		3347
3006	$TICK_WATCHER->start;	3348	$TICK_WATCHER->start;
		3349	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3007	Event::loop;	3350	EV::loop;
3008	}	3351	}
3009		3352
3010	#############################################################################	3353	#############################################################################
3011	# initialisation and cleanup	3354	# initialisation and cleanup
3012		3355
3013	# install some emergency cleanup handlers	3356	# install some emergency cleanup handlers
3014	BEGIN {	3357	BEGIN {
		3358	our %SIGWATCHER = ();
3015	for my $signal (qw(INT HUP TERM)) {	3359	for my $signal (qw(INT HUP TERM)) {
3016	Event->signal (	3360	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3017	reentrant => 0,
3018	data => WF_AUTOCANCEL,
3019	signal => $signal,
3020	prio => 0,
3021	cb => sub {
3022	cf::cleanup "SIG$signal";	3361	cf::cleanup "SIG$signal";
3023	},
3024	);	3362	};
3025	}	3363	}
3026	}	3364	}
3027		3365
3028	sub write_runtime {	3366	sub write_runtime {
3029	my $runtime = "$LOCALDIR/runtime";	3367	my $runtime = "$LOCALDIR/runtime";
…		…
3074	# and maps saved/destroyed asynchronously.	3412	# and maps saved/destroyed asynchronously.
3075	warn "begin emergency player save\n";	3413	warn "begin emergency player save\n";
3076	for my $login (keys %cf::PLAYER) {	3414	for my $login (keys %cf::PLAYER) {
3077	my $pl = $cf::PLAYER{$login} or next;	3415	my $pl = $cf::PLAYER{$login} or next;
3078	$pl->valid or next;	3416	$pl->valid or next;
		3417	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079	$pl->save;	3418	$pl->save;
3080	}	3419	}
3081	warn "end emergency player save\n";	3420	warn "end emergency player save\n";
3082		3421
3083	warn "begin emergency map save\n";	3422	warn "begin emergency map save\n";
…		…
3122	warn "syncing database to disk";	3461	warn "syncing database to disk";
3123	BDB::db_env_txn_checkpoint $DB_ENV;	3462	BDB::db_env_txn_checkpoint $DB_ENV;
3124		3463
3125	# 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
3126		3465
3127	warn "cancelling all WF_AUTOCANCEL watchers";
3128	for (Event::all_watchers) {
3129	$_->cancel if $_->data & WF_AUTOCANCEL;
3130	}
3131
3132	warn "flushing outstanding aio requests";	3466	warn "flushing outstanding aio requests";
3133	for (;;) {	3467	for (;;) {
3134	BDB::flush;	3468	BDB::flush;
3135	IO::AIO::flush;	3469	IO::AIO::flush;
3136	Coro::cede;	3470	Coro::cede_notself;
3137	last unless IO::AIO::nreqs || BDB::nreqs;	3471	last unless IO::AIO::nreqs || BDB::nreqs;
3138	warn "iterate...";	3472	warn "iterate...";
3139	}	3473	}
3140		3474
3141	++$RELOAD;	3475	++$RELOAD;
…		…
3200	warn "reloading cf.pm";	3534	warn "reloading cf.pm";
3201	require cf;	3535	require cf;
3202	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3536	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203		3537
3204	warn "loading config and database again";	3538	warn "loading config and database again";
3205	cf::cfg_load;	3539	cf::reload_config;
3206		3540
3207	warn "loading extensions";	3541	warn "loading extensions";
3208	cf::load_extensions;	3542	cf::load_extensions;
3209		3543
3210	warn "reattaching attachments to objects/players";	3544	warn "reattaching attachments to objects/players";
…		…
3230		3564
3231	sub reload_perl() {	3565	sub reload_perl() {
3232	# doing reload synchronously and two reloads happen back-to-back,	3566	# doing reload synchronously and two reloads happen back-to-back,
3233	# coro crashes during coro_state_free->destroy here.	3567	# coro crashes during coro_state_free->destroy here.
3234		3568
3235	$RELOAD_WATCHER ||= Event->timer (	3569	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3236	reentrant => 0,
3237	after => 0,
3238	data => WF_AUTOCANCEL,
3239	cb => sub {
3240	do_reload_perl;
3241	undef $RELOAD_WATCHER;	3570	undef $RELOAD_WATCHER;
3242	},	3571	do_reload_perl;
3243	);	3572	};
3244	}	3573	}
3245		3574
3246	register_command "reload" => sub {	3575	register_command "reload" => sub {
3247	my ($who, $arg) = @_;	3576	my ($who, $arg) = @_;
3248		3577
3249	if ($who->flag (FLAG_WIZ)) {	3578	if ($who->flag (FLAG_WIZ)) {
3250	$who->message ("reloading server.");	3579	$who->message ("reloading server.");
		3580	async {
		3581	$Coro::current->{desc} = "perl_reload";
3251	async { reload_perl };	3582	reload_perl;
		3583	};
3252	}	3584	}
3253	};	3585	};
3254		3586
3255	unshift @INC, $LIBDIR;	3587	unshift @INC, $LIBDIR;
3256		3588
…		…
3275	my $signal = new Coro::Signal;	3607	my $signal = new Coro::Signal;
3276	push @WAIT_FOR_TICK_BEGIN, $signal;	3608	push @WAIT_FOR_TICK_BEGIN, $signal;
3277	$signal->wait;	3609	$signal->wait;
3278	}	3610	}
3279		3611
3280	my $min = 1e6;#d#	3612	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3281	my $avg = 10;
3282	$TICK_WATCHER = Event->timer (
3283	reentrant => 0,
3284	parked => 1,
3285	prio => 0,
3286	at => $NEXT_TICK || $TICK,
3287	data => WF_AUTOCANCEL,
3288	cb => sub {
3289	if ($Coro::current != $Coro::main) {	3613	if ($Coro::current != $Coro::main) {
3290	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"
3291	unless ++$bug_warning > 10;	3615	unless ++$bug_warning > 10;
3292	return;	3616	return;
3293	}	3617	}
3294		3618
3295	$NOW = $tick_start = Event::time;	3619	$NOW = $tick_start = EV::now;
3296		3620
3297	cf::server_tick; # one server iteration	3621	cf::server_tick; # one server iteration
3298		3622
3299	0 && sync_job {#d#	3623	$RUNTIME += $TICK;
3300	for(1..10) {	3624	$NEXT_TICK = $_[0]->at;
3301	my $t = Event::time;
3302	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3303	or die;
3304		3625
3305	$map->width (50);	3626	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3306	$map->height (50);	3627	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3307	$map->alloc;	3628	Coro::async_pool {
3308	$map->_load_objects ("/tmp/x.map", 1);	3629	$Coro::current->{desc} = "runtime saver";
3309	my $t = Event::time - $t;	3630	write_runtime
3310		3631	or warn "ERROR: unable to write runtime file: $!";
3311	#next unless $t < 0.0013;#d#
3312	if ($t < $min) {
3313	$min = $t;
3314	}
3315	$avg = $avg * 0.99 + $t * 0.01;
3316	}
3317	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318	exit 0;
3319	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320	};	3632	};
		3633	}
3321		3634
3322	$RUNTIME += $TICK;
3323	$NEXT_TICK += $TICK;
3324
3325	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326	$NEXT_RUNTIME_WRITE = $NOW + 10;
3327	Coro::async_pool {
3328	write_runtime
3329	or warn "ERROR: unable to write runtime file: $!";
3330	};
3331	}
3332
3333	# my $AFTER = Event::time;
3334	# warn $AFTER - $NOW;#d#
3335
3336	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3635	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337	$sig->send;	3636	$sig->send;
3338	}	3637	}
3339	while (my $sig = shift @WAIT_FOR_TICK) {	3638	while (my $sig = shift @WAIT_FOR_TICK) {
3340	$sig->send;	3639	$sig->send;
3341	}	3640	}
3342		3641
3343	$NOW = Event::time;
3344
3345	# if we are delayed by four ticks or more, skip them all
3346	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3347
3348	$TICK_WATCHER->at ($NEXT_TICK);
3349	$TICK_WATCHER->start;
3350
3351	$LOAD = ($NOW - $tick_start) / $TICK;	3642	$LOAD = ($NOW - $tick_start) / $TICK;
3352	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3643	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353		3644
3354	_post_tick;	3645	_post_tick;
3355		3646	};
3356		3647	$TICK_WATCHER->priority (EV::MAXPRI);
3357	},
3358	);
3359		3648
3360	{	3649	{
3361	BDB::max_poll_time $TICK * 0.1;	3650	# configure BDB
3362	$BDB_POLL_WATCHER = Event->io (	3651
3363	reentrant => 0,
3364	fd => BDB::poll_fileno,
3365	poll => 'r',
3366	prio => 0,
3367	data => WF_AUTOCANCEL,
3368	cb => \&BDB::poll_cb,
3369	);
3370	BDB::min_parallel 8;	3652	BDB::min_parallel 8;
3371		3653	BDB::max_poll_reqs $TICK * 0.1;
3372	BDB::set_sync_prepare {	3654	$Coro::BDB::WATCHER->priority (1);
3373	my $status;
3374	my $current = $Coro::current;
3375	(
3376	sub {
3377	$status = $!;
3378	$current->ready; undef $current;
3379	},
3380	sub {
3381	Coro::schedule while defined $current;
3382	$! = $status;
3383	},
3384	)
3385	};
3386		3655
3387	unless ($DB_ENV) {	3656	unless ($DB_ENV) {
3388	$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);
3389		3662
3390	cf::sync_job {	3663	cf::sync_job {
3391	eval {	3664	eval {
3392	BDB::db_env_open	3665	BDB::db_env_open
3393	$DB_ENV,	3666	$DB_ENV,
…		…
3395	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
3396	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3669	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397	0666;	3670	0666;
3398		3671
3399	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3672	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402	$DB_ENV->set_lk_detect;
3403	};	3673	};
3404		3674
3405	cf::cleanup "db_env_open(db): $@" if $@;	3675	cf::cleanup "db_env_open(db): $@" if $@;
3406	};	3676	};
3407	}	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	};
3408	}	3688	}
3409		3689
3410	{	3690	{
		3691	# configure IO::AIO
		3692
3411	IO::AIO::min_parallel 8;	3693	IO::AIO::min_parallel 8;
3412
3413	undef $Coro::AIO::WATCHER;
3414	IO::AIO::max_poll_time $TICK * 0.1;	3694	IO::AIO::max_poll_time $TICK * 0.1;
3415	$AIO_POLL_WATCHER = Event->io (	3695	$Coro::AIO::WATCHER->priority (1);
3416	reentrant => 0,
3417	data => WF_AUTOCANCEL,
3418	fd => IO::AIO::poll_fileno,
3419	poll => 'r',
3420	prio => 6,
3421	cb => \&IO::AIO::poll_cb,
3422	);
3423	}	3696	}
3424		3697
3425	my $_log_backtrace;	3698	my $_log_backtrace;
3426		3699
3427	sub _log_backtrace {	3700	sub _log_backtrace {
…		…
3431		3704
3432	# limit the # of concurrent backtraces	3705	# limit the # of concurrent backtraces
3433	if ($_log_backtrace < 2) {	3706	if ($_log_backtrace < 2) {
3434	++$_log_backtrace;	3707	++$_log_backtrace;
3435	async {	3708	async {
		3709	$Coro::current->{desc} = "abt $msg";
		3710
3436	my @bt = fork_call {	3711	my @bt = fork_call {
3437	@addr = map { sprintf "%x", $_ } @addr;	3712	@addr = map { sprintf "%x", $_ } @addr;
3438	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3713	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439	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 |"
3440	or die "addr2line: $!";	3715	or die "addr2line: $!";

Diff Legend

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