[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.403 by root, Mon Dec 17 07:09:18 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;	9	use EV;
10	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.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
…		…
76	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	75	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77	our $TICK_WATCHER;	76	our $TICK_WATCHER;
78	our $AIO_POLL_WATCHER;	77	our $AIO_POLL_WATCHER;
79	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	78	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80	our $NEXT_TICK;	79	our $NEXT_TICK;
81	our $NOW;
82	our $USE_FSYNC = 1; # use fsync to write maps - default off	80	our $USE_FSYNC = 1; # use fsync to write maps - default off
83		81
84	our $BDB_POLL_WATCHER;	82	our $BDB_POLL_WATCHER;
		83	our $BDB_DEADLOCK_WATCHER;
		84	our $BDB_CHECKPOINT_WATCHER;
		85	our $BDB_TRICKLE_WATCHER;
85	our $DB_ENV;	86	our $DB_ENV;
86		87
87	our %CFG;	88	our %CFG;
88		89
89	our $UPTIME; $UPTIME \|\|= time;	90	our $UPTIME; $UPTIME \|\|= time;
90	our $RUNTIME;	91	our $RUNTIME;
		92	our $NOW;
91		93
92	our %PLAYER; # all users	94	our (%PLAYER, %PLAYER_LOADING); # all users
93	our %MAP; # all maps	95	our (%MAP, %MAP_LOADING ); # all maps
94	our $LINK_MAP; # the special {link} map, which is always available	96	our $LINK_MAP; # the special {link} map, which is always available
95		97
96	# used to convert map paths into valid unix filenames by replacing / by ∕	98	# used to convert map paths into valid unix filenames by replacing / by ∕
97	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98		100
…		…
159		161
160	The raw value load value from the last tick.	162	The raw value load value from the last tick.
161		163
162	=item %cf::CFG	164	=item %cf::CFG
163		165
164	Configuration for the server, loaded from C</etc/crossfire/config>, or	166	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165	from wherever your confdir points to.	167	from wherever your confdir points to.
166		168
167	=item cf::wait_for_tick, cf::wait_for_tick_begin	169	=item cf::wait_for_tick, cf::wait_for_tick_begin
168		170
169	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	171	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
…		…
187	$msg .= "\n"	189	$msg .= "\n"
188	unless $msg =~ /\n$/;	190	unless $msg =~ /\n$/;
189		191
190	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191		193
192	utf8::encode $msg;
193	LOG llevError, $msg;	194	LOG llevError, $msg;
194	};	195	};
195	}	196	}
196		197
197	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
213	)) {	214	)) {
214	no strict 'refs';	215	no strict 'refs';
215	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	216	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216	}	217	}
217		218
218	$Event::DIED = sub {	219	$EV::DIED = sub {
219	warn "error in event callback: @_";	220	warn "error in event callback: @_";
220	};	221	};
221		222
222	#############################################################################	223	#############################################################################
223		224
…		…
246	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	247	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247	$d	248	$d
248	} \|\| "[unable to dump $_[0]: '$@']";	249	} \|\| "[unable to dump $_[0]: '$@']";
249	}	250	}
250		251
251	=item $ref = cf::from_json $json	252	=item $ref = cf::decode_json $json
252		253
253	Converts a JSON string into the corresponding perl data structure.	254	Converts a JSON string into the corresponding perl data structure.
254		255
255	=item $json = cf::to_json $ref	256	=item $json = cf::encode_json $ref
256		257
257	Converts a perl data structure into its JSON representation.	258	Converts a perl data structure into its JSON representation.
258		259
259	=cut	260	=cut
260		261
261	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	262	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262		263
263	sub to_json ($) { $json_coder->encode ($_[0]) }	264	sub encode_json($) { $json_coder->encode ($_[0]) }
264	sub from_json ($) { $json_coder->decode ($_[0]) }	265	sub decode_json($) { $json_coder->decode ($_[0]) }
265		266
266	=item cf::lock_wait $string	267	=item cf::lock_wait $string
267		268
268	Wait until the given lock is available. See cf::lock_acquire.	269	Wait until the given lock is available. See cf::lock_acquire.
269		270
…		…
272	Wait until the given lock is available and then acquires it and returns	273	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,	274	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	275	for example when the coroutine gets canceled), the lock is automatically
275	returned.	276	returned.
276		277
		278	Locks are not recursive, locking from the same coro twice results in a
		279	deadlocked coro.
		280
277	Lock names should begin with a unique identifier (for example, cf::map::find	281	Lock names should begin with a unique identifier (for example, cf::map::find
278	uses map_find and cf::map::load uses map_load).	282	uses map_find and cf::map::load uses map_load).
279		283
280	=item $locked = cf::lock_active $string	284	=item $locked = cf::lock_active $string
281		285
282	Return true if the lock is currently active, i.e. somebody has locked it.	286	Return true if the lock is currently active, i.e. somebody has locked it.
283		287
284	=cut	288	=cut
285		289
286	our %LOCK;	290	our %LOCK;
		291	our %LOCKER;#d#
287		292
288	sub lock_wait($) {	293	sub lock_wait($) {
289	my ($key) = @_;	294	my ($key) = @_;
		295
		296	if ($LOCKER{$key} == $Coro::current) {#d#
		297	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		298	return;#d#
		299	}#d#
290		300
291	# wait for lock, if any	301	# wait for lock, if any
292	while ($LOCK{$key}) {	302	while ($LOCK{$key}) {
293	push @{ $LOCK{$key} }, $Coro::current;	303	push @{ $LOCK{$key} }, $Coro::current;
294	Coro::schedule;	304	Coro::schedule;
…		…
300		310
301	# wait, to be sure we are not locked	311	# wait, to be sure we are not locked
302	lock_wait $key;	312	lock_wait $key;
303		313
304	$LOCK{$key} = [];	314	$LOCK{$key} = [];
		315	$LOCKER{$key} = $Coro::current;#d#
305		316
306	Coro::guard {	317	Coro::guard {
		318	delete $LOCKER{$key};#d#
307	# wake up all waiters, to be on the safe side	319	# wake up all waiters, to be on the safe side
308	$_->ready for @{ delete $LOCK{$key} };	320	$_->ready for @{ delete $LOCK{$key} };
309	}	321	}
310	}	322	}
311		323
…		…
323	};	335	};
324	$TICK_WATCHER->stop;	336	$TICK_WATCHER->stop;
325	$guard	337	$guard
326	}	338	}
327		339
		340	=item cf::periodic $interval, $cb
		341
		342	Like EV::periodic, but randomly selects a starting point so that the actions
		343	get spread over timer.
		344
		345	=cut
		346
		347	sub periodic($$) {
		348	my ($interval, $cb) = @_;
		349
		350	my $start = rand List::Util::min 180, $interval;
		351
		352	EV::periodic $start, $interval, 0, $cb
		353	}
		354
328	=item cf::get_slot $time[, $priority[, $name]]	355	=item cf::get_slot $time[, $priority[, $name]]
329		356
330	Allocate $time seconds of blocking CPU time at priority C<$priority>:	357	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	358	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.	359	of cpu time till the next tick. The slot is only valid till the next cede.
…		…
341	our @SLOT_QUEUE;	368	our @SLOT_QUEUE;
342	our $SLOT_QUEUE;	369	our $SLOT_QUEUE;
343		370
344	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	371	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345	$SLOT_QUEUE = Coro::async {	372	$SLOT_QUEUE = Coro::async {
		373	$Coro::current->desc ("timeslot manager");
		374
346	my $signal = new Coro::Signal;	375	my $signal = new Coro::Signal;
347		376
348	while () {	377	while () {
349	next_job:	378	next_job:
350	my $avail = cf::till_tick;	379	my $avail = cf::till_tick;
…		…
358	}	387	}
359	}	388	}
360	}	389	}
361		390
362	if (@SLOT_QUEUE) {	391	if (@SLOT_QUEUE) {
363	# we do not use wait_For_tick() as it returns immediately when tick is inactive	392	# we do not use wait_for_tick() as it returns immediately when tick is inactive
364	push @cf::WAIT_FOR_TICK, $signal;	393	push @cf::WAIT_FOR_TICK, $signal;
365	$signal->wait;	394	$signal->wait;
366	} else {	395	} else {
367	Coro::schedule;	396	Coro::schedule;
368	}	397	}
…		…
391		420
392	BEGIN { *async = \&Coro::async_pool }	421	BEGIN { *async = \&Coro::async_pool }
393		422
394	=item cf::sync_job { BLOCK }	423	=item cf::sync_job { BLOCK }
395		424
396	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	425	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	426	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	427	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399	acceptable.	428	acceptable.
400		429
401	If it must be done, put the blocking parts into C<sync_job>. This will run	430	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	431	the given BLOCK in another coroutine while waiting for the result. The
…		…
407		436
408	sub sync_job(&) {	437	sub sync_job(&) {
409	my ($job) = @_;	438	my ($job) = @_;
410		439
411	if ($Coro::current == $Coro::main) {	440	if ($Coro::current == $Coro::main) {
412	my $time = Event::time;	441	my $time = EV::time;
413		442
414	# this is the main coro, too bad, we have to block	443	# this is the main coro, too bad, we have to block
415	# till the operation succeeds, freezing the server :/	444	# till the operation succeeds, freezing the server :/
416		445
		446	LOG llevError, Carp::longmess "sync job";#d#
		447
417	# TODO: use suspend/resume instead	448	# TODO: use suspend/resume instead
418	# (but this is cancel-safe)	449	# (but this is cancel-safe)
419	my $freeze_guard = freeze_mainloop;	450	my $freeze_guard = freeze_mainloop;
420		451
421	my $busy = 1;	452	my $busy = 1;
422	my @res;	453	my @res;
423		454
424	(async {	455	(async {
		456	$Coro::current->desc ("sync job coro");
425	@res = eval { $job->() };	457	@res = eval { $job->() };
426	warn $@ if $@;	458	warn $@ if $@;
427	undef $busy;	459	undef $busy;
428	})->prio (Coro::PRIO_MAX);	460	})->prio (Coro::PRIO_MAX);
429		461
430	while ($busy) {	462	while ($busy) {
431	Coro::cede or Event::one_event;	463	if (Coro::nready) {
		464	Coro::cede_notself;
		465	} else {
		466	EV::loop EV::LOOP_ONESHOT;
432	}	467	}
		468	}
433		469
434	$time = Event::time - $time;	470	$time = EV::time - $time;
435		471
436	LOG llevError \| logBacktrace, Carp::longmess "long sync job"	472	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
437	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;	473	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438		474
439	$tick_start += $time; # do not account sync jobs to server load	475	$tick_start += $time; # do not account sync jobs to server load
…		…
469	=item fork_call { }, $args	505	=item fork_call { }, $args
470		506
471	Executes the given code block with the given arguments in a seperate	507	Executes the given code block with the given arguments in a seperate
472	process, returning the results. Everything must be serialisable with	508	process, returning the results. Everything must be serialisable with
473	Coro::Storable. May, of course, block. Note that the executed sub may	509	Coro::Storable. May, of course, block. Note that the executed sub may
474	never block itself or use any form of Event handling.	510	never block itself or use any form of event handling.
475		511
476	=cut	512	=cut
477		513
478	sub fork_call(&@) {	514	sub fork_call(&@) {
479	my ($cb, @args) = @_;	515	my ($cb, @args) = @_;
480		516
481	# we seemingly have to make a local copy of the whole thing,	517	# we seemingly have to make a local copy of the whole thing,
482	# otherwise perl prematurely frees the stuff :/	518	# otherwise perl prematurely frees the stuff :/
483	# TODO: investigate and fix (liekly this will be rather laborious)	519	# TODO: investigate and fix (likely this will be rather laborious)
484		520
485	my @res = Coro::Util::fork_eval {	521	my @res = Coro::Util::fork_eval {
486	reset_signals;	522	reset_signals;
487	&$cb	523	&$cb
488	}, @args;	524	}, @args;
…		…
497	=item cf::db_put $family => $key => $value	533	=item cf::db_put $family => $key => $value
498		534
499	Stores the given C<$value> in the family. It can currently store binary	535	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).	536	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501		537
		538	=item $db = cf::db_table "name"
		539
		540	Create and/or open a new database table. The string must not be "db" and must be unique
		541	within each server.
		542
502	=cut	543	=cut
		544
		545	sub db_table($) {
		546	my ($name) = @_;
		547	my $db = BDB::db_create $DB_ENV;
		548
		549	eval {
		550	$db->set_flags (BDB::CHKSUM);
		551
		552	utf8::encode $name;
		553	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		554	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		555	cf::cleanup "db_open(db): $!" if $!;
		556	};
		557	cf::cleanup "db_open(db): $@" if $@;
		558
		559	$db
		560	}
503		561
504	our $DB;	562	our $DB;
505		563
506	sub db_init {	564	sub db_init {
507	unless ($DB) {
508	$DB = BDB::db_create $DB_ENV;
509
510	cf::sync_job {	565	cf::sync_job {
511	eval {	566	$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	}	567	};
521	}	568	}
522		569
523	sub db_get($$) {	570	sub db_get($$) {
524	my $key = "$_[0]/$_[1]";	571	my $key = "$_[0]/$_[1]";
525		572
…		…
575	if (1) {	622	if (1) {
576	$md5 =	623	$md5 =
577	join "\x00",	624	join "\x00",
578	$processversion,	625	$processversion,
579	map {	626	map {
580	Coro::cede;	627	cf::cede_to_tick;
581	($src->[$_], Digest::MD5::md5_hex $data[$_])	628	($src->[$_], Digest::MD5::md5_hex $data[$_])
582	} 0.. $#$src;	629	} 0.. $#$src;
583		630
584		631
585	my $dbmd5 = db_get cache => "$id/md5";	632	my $dbmd5 = db_get cache => "$id/md5";
…		…
629	attach callbacks/event handlers (a collection of which is called an "attachment")	676	attach callbacks/event handlers (a collection of which is called an "attachment")
630	to it. All such attachable objects support the following methods.	677	to it. All such attachable objects support the following methods.
631		678
632	In the following description, CLASS can be any of C<global>, C<object>	679	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	680	C<player>, C<client> or C<map> (i.e. the attachable objects in
634	Crossfire TRT).	681	Deliantra).
635		682
636	=over 4	683	=over 4
637		684
638	=item $attachable->attach ($attachment, key => $value...)	685	=item $attachable->attach ($attachment, key => $value...)
639		686
…		…
937		984
938	=cut	985	=cut
939		986
940	#############################################################################	987	#############################################################################
941	# object support	988	# object support
942	#
943		989
		990	sub _object_equal($$);
		991	sub _object_equal($$) {
		992	my ($a, $b) = @_;
		993
		994	return 0 unless (ref $a) eq (ref $b);
		995
		996	if ("HASH" eq ref $a) {
		997	my @ka = keys %$a;
		998	my @kb = keys %$b;
		999
		1000	return 0 if @ka != @kb;
		1001
		1002	for (0 .. $#ka) {
		1003	return 0 unless $ka[$_] eq $kb[$_];
		1004	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		1005	}
		1006
		1007	} elsif ("ARRAY" eq ref $a) {
		1008
		1009	return 0 if @$a != @$b;
		1010
		1011	for (0 .. $#$a) {
		1012	return 0 unless _object_equal $a->[$_], $b->[$_];
		1013	}
		1014
		1015	} elsif ($a ne $b) {
		1016	return 0;
		1017	}
		1018
		1019	1
		1020	}
		1021
		1022	our $SLOW_MERGES;#d#
944	sub _can_merge {	1023	sub _can_merge {
945	my ($ob1, $ob2) = @_;	1024	my ($ob1, $ob2) = @_;
946		1025
947	local $Storable::canonical = 1;	1026	++$SLOW_MERGES;#d#
948	my $fob1 = Storable::freeze $ob1;
949	my $fob2 = Storable::freeze $ob2;
950		1027
951	$fob1 eq $fob2	1028	# we do the slow way here
		1029	return _object_equal $ob1, $ob2
952	}	1030	}
953		1031
954	sub reattach {	1032	sub reattach {
955	# basically do the same as instantiate, without calling instantiate	1033	# basically do the same as instantiate, without calling instantiate
956	my ($obj) = @_;	1034	my ($obj) = @_;
…		…
978	cf::attachable->attach (	1056	cf::attachable->attach (
979	prio => -1000000,	1057	prio => -1000000,
980	on_instantiate => sub {	1058	on_instantiate => sub {
981	my ($obj, $data) = @_;	1059	my ($obj, $data) = @_;
982		1060
983	$data = from_json $data;	1061	$data = decode_json $data;
984		1062
985	for (@$data) {	1063	for (@$data) {
986	my ($name, $args) = @$_;	1064	my ($name, $args) = @$_;
987		1065
988	$obj->attach ($name, %{$args \|\| {} });	1066	$obj->attach ($name, %{$args \|\| {} });
…		…
1004	sub object_freezer_save {	1082	sub object_freezer_save {
1005	my ($filename, $rdata, $objs) = @_;	1083	my ($filename, $rdata, $objs) = @_;
1006		1084
1007	sync_job {	1085	sync_job {
1008	if (length $$rdata) {	1086	if (length $$rdata) {
		1087	utf8::decode (my $decname = $filename);
1009	warn sprintf "saving %s (%d,%d)\n",	1088	warn sprintf "saving %s (%d,%d)\n",
1010	$filename, length $$rdata, scalar @$objs;	1089	$decname, length $$rdata, scalar @$objs;
1011		1090
1012	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1091	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1013	chmod SAVE_MODE, $fh;	1092	chmod SAVE_MODE, $fh;
1014	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1093	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015	aio_fsync $fh if $cf::USE_FSYNC;	1094	aio_fsync $fh if $cf::USE_FSYNC;
1016	close $fh;	1095	close $fh;
1017		1096
1018	if (@$objs) {	1097	if (@$objs) {
1019	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1098	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1020	chmod SAVE_MODE, $fh;	1099	chmod SAVE_MODE, $fh;
1021	my $data = Storable::nfreeze { version => 1, objs => $objs };	1100	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022	aio_write $fh, 0, (length $data), $data, 0;	1101	aio_write $fh, 0, (length $data), $data, 0;
1023	aio_fsync $fh if $cf::USE_FSYNC;	1102	aio_fsync $fh if $cf::USE_FSYNC;
1024	close $fh;	1103	close $fh;
1025	aio_rename "$filename.pst~", "$filename.pst";	1104	aio_rename "$filename.pst~", "$filename.pst";
1026	}	1105	}
…		…
1034	}	1113	}
1035	} else {	1114	} else {
1036	aio_unlink $filename;	1115	aio_unlink $filename;
1037	aio_unlink "$filename.pst";	1116	aio_unlink "$filename.pst";
1038	}	1117	}
1039	}	1118	};
1040	}	1119	}
1041		1120
1042	sub object_freezer_as_string {	1121	sub object_freezer_as_string {
1043	my ($rdata, $objs) = @_;	1122	my ($rdata, $objs) = @_;
1044		1123
…		…
1056	or return;	1135	or return;
1057		1136
1058	unless (aio_stat "$filename.pst") {	1137	unless (aio_stat "$filename.pst") {
1059	(aio_load "$filename.pst", $av) >= 0	1138	(aio_load "$filename.pst", $av) >= 0
1060	or return;	1139	or return;
		1140
1061	$av = eval { (Storable::thaw $av)->{objs} };	1141	my $st = eval { Coro::Storable::thaw $av };
		1142	$av = $st->{objs};
1062	}	1143	}
1063		1144
		1145	utf8::decode (my $decname = $filename);
1064	warn sprintf "loading %s (%d)\n",	1146	warn sprintf "loading %s (%d,%d)\n",
1065	$filename, length $data, scalar @{$av \|\| []};	1147	$decname, length $data, scalar @{$av \|\| []};
		1148
1066	return ($data, $av);	1149	($data, $av)
1067	}	1150	}
1068		1151
1069	=head2 COMMAND CALLBACKS	1152	=head2 COMMAND CALLBACKS
1070		1153
1071	=over 4	1154	=over 4
…		…
1149	my ($type, $reply, @payload) =	1232	my ($type, $reply, @payload) =
1150	"ARRAY" eq ref $msg	1233	"ARRAY" eq ref $msg
1151	? @$msg	1234	? @$msg
1152	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	1235	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153		1236
		1237	my @reply;
		1238
1154	if (my $cb = $EXTCMD{$type}) {	1239	if (my $cb = $EXTCMD{$type}) {
1155	my @reply = $cb->($pl, @payload);	1240	@reply = $cb->($pl, @payload);
1156
1157	$pl->ext_reply ($reply, @reply)
1158	if $reply;
1159	}	1241	}
		1242
		1243	$pl->ext_reply ($reply, @reply)
		1244	if $reply;
		1245
1160	} else {	1246	} else {
1161	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1247	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162	}	1248	}
1163		1249
1164	cf::override;	1250	cf::override;
…		…
1254		1340
1255	=head3 cf::player	1341	=head3 cf::player
1256		1342
1257	=over 4	1343	=over 4
1258		1344
		1345	=item cf::player::num_playing
		1346
		1347	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1348
		1349	=cut
		1350
		1351	sub num_playing {
		1352	scalar grep
		1353	$_->ob->map
		1354	&& !$_->hidden
		1355	&& !$_->ob->flag (cf::FLAG_WIZ),
		1356	cf::player::list
		1357	}
		1358
1259	=item cf::player::find $login	1359	=item cf::player::find $login
1260		1360
1261	Returns the given player object, loading it if necessary (might block).	1361	Returns the given player object, loading it if necessary (might block).
1262		1362
1263	=cut	1363	=cut
…		…
1298	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1398	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1399	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1400	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301	aio_unlink +(playerdir $login) . "/$login.pl";	1401	aio_unlink +(playerdir $login) . "/$login.pl";
1302		1402
1303	my $pl = load_pl path $login	1403	my $f = new_from_file cf::object::thawer path $login
1304	or return;	1404	or return;
		1405
		1406	my $pl = cf::player::load_pl $f
		1407	or return;
		1408	local $cf::PLAYER_LOADING{$login} = $pl;
		1409	$f->resolve_delayed_derefs;
1305	$cf::PLAYER{$login} = $pl	1410	$cf::PLAYER{$login} = $pl
1306	}	1411	}
1307	}	1412	}
1308	}	1413	}
1309		1414
…		…
1319		1424
1320	aio_mkdir playerdir $pl, 0770;	1425	aio_mkdir playerdir $pl, 0770;
1321	$pl->{last_save} = $cf::RUNTIME;	1426	$pl->{last_save} = $cf::RUNTIME;
1322		1427
1323	$pl->save_pl ($path);	1428	$pl->save_pl ($path);
1324	Coro::cede;	1429	cf::cede_to_tick;
1325	}	1430	}
1326		1431
1327	sub new($) {	1432	sub new($) {
1328	my ($login) = @_;	1433	my ($login) = @_;
1329		1434
…		…
1407	or return [];	1512	or return [];
1408		1513
1409	my @logins;	1514	my @logins;
1410		1515
1411	for my $login (@$dirs) {	1516	for my $login (@$dirs) {
		1517	my $path = path $login;
		1518
		1519	# a .pst is a dead give-away for a valid player
		1520	unless (-e "$path.pst") {
1412	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1521	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413	aio_read $fh, 0, 512, my $buf, 0 or next;	1522	aio_read $fh, 0, 512, my $buf, 0 or next;
1414	$buf !~ /^password -------------$/m or next; # official not-valid tag	1523	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1524	}
1415		1525
1416	utf8::decode $login;	1526	utf8::decode $login;
1417	push @logins, $login;	1527	push @logins, $login;
1418	}	1528	}
1419		1529
…		…
1452		1562
1453	Expand crossfire pod fragments into protocol xml.	1563	Expand crossfire pod fragments into protocol xml.
1454		1564
1455	=cut	1565	=cut
1456		1566
		1567	use re 'eval';
		1568
		1569	my $group;
		1570	my $interior; $interior = qr{
		1571	# match a pod interior sequence sans C<< >>
		1572	(?:
		1573	\ (.*?)\ (?{ $group = $^N })
		1574	\| < (??{$interior}) >
		1575	)
		1576	}x;
		1577
1457	sub expand_cfpod {	1578	sub expand_cfpod {
1458	((my $self), (local $_)) = @_;	1579	my ($self, $pod) = @_;
1459		1580
1460	# escape & and <	1581	my $xml;
1461	s/&/&/g;
1462	s/(?<![BIUGH])</</g;
1463		1582
1464	# this is buggy, it needs to properly take care of nested <'s	1583	while () {
		1584	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
		1585	$group = $1;
1465		1586
1466	1 while	1587	$group =~ s/&/&/g;
1467	# replace B<>, I<>, U<> etc.	1588	$group =~ s/</</g;
1468	s/B<([^\>]*)>/<b>$1<\/b>/	1589
1469	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1590	$xml .= $group;
1470	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1591	} elsif ($pod =~ m%\G
1471	# replace G<male\|female> tags	1592	([BCGHITU])
1472	\|\| s{G<([^>\|])\\|([^>])>}{	1593	<
1473	$self->gender ? $2 : $1	1594	(?:
1474	}ge	1595	([^<>]*) (?{ $group = $^N })
1475	# replace H<hint text>	1596	\| < $interior >
1476	\|\| s{H<([^\>]*)>}	1597	)
		1598	>
		1599	%gcsx
1477	{	1600	) {
		1601	my ($code, $data) = ($1, $group);
		1602
		1603	if ($code eq "B") {
		1604	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1605	} elsif ($code eq "I") {
		1606	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1607	} elsif ($code eq "U") {
		1608	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1609	} elsif ($code eq "C") {
		1610	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1611	} elsif ($code eq "T") {
		1612	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1613	} elsif ($code eq "G") {
		1614	my ($male, $female) = split /\\|/, $data;
		1615	$data = $self->gender ? $female : $male;
		1616	$xml .= expand_cfpod ($self, $data);
		1617	} elsif ($code eq "H") {
1478	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1618	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1479	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1619	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480	"")	1620	"")
1481	[$self->{hintmode}]	1621	[$self->{hintmode}];
		1622	} else {
		1623	$xml .= "error processing '$code($data)' directive";
1482	}ge;	1624	}
		1625	} else {
		1626	if ($pod =~ /\G(.+)/) {
		1627	warn "parse error while expanding $pod (at $1)";
		1628	}
		1629	last;
		1630	}
		1631	}
1483		1632
		1633	for ($xml) {
1484	# create single paragraphs (very hackish)	1634	# create single paragraphs (very hackish)
1485	s/(?<=\S)\n(?=\w)/ /g;	1635	s/(?<=\S)\n(?=\w)/ /g;
1486		1636
1487	# compress some whitespace	1637	# compress some whitespace
1488	s/\s+\n/\n/g; # ws line-ends	1638	s/\s+\n/\n/g; # ws line-ends
1489	s/\n\n+/\n/g; # double lines	1639	s/\n\n+/\n/g; # double lines
1490	s/^\n+//; # beginning lines	1640	s/^\n+//; # beginning lines
1491	s/\n+$//; # ending lines	1641	s/\n+$//; # ending lines
		1642	}
1492		1643
1493	$_	1644	$xml
1494	}	1645	}
		1646
		1647	no re 'eval';
1495		1648
1496	sub hintmode {	1649	sub hintmode {
1497	$_[0]{hintmode} = $_[1] if @_ > 1;	1650	$_[0]{hintmode} = $_[1] if @_ > 1;
1498	$_[0]{hintmode}	1651	$_[0]{hintmode}
1499	}	1652	}
…		…
1743		1896
1744	sub load_header_from($) {	1897	sub load_header_from($) {
1745	my ($self, $path) = @_;	1898	my ($self, $path) = @_;
1746		1899
1747	utf8::encode $path;	1900	utf8::encode $path;
1748	#aio_open $path, O_RDONLY, 0	1901	my $f = new_from_file cf::object::thawer $path
1749	# or return;
1750
1751	$self->_load_header ($path)
1752	or return;	1902	or return;
		1903
		1904	$self->_load_header ($f)
		1905	or return;
		1906
		1907	local $MAP_LOADING{$self->{path}} = $self;
		1908	$f->resolve_delayed_derefs;
1753		1909
1754	$self->{load_path} = $path;	1910	$self->{load_path} = $path;
1755		1911
1756	1	1912	1
1757	}	1913	}
…		…
1811	sub find {	1967	sub find {
1812	my ($path, $origin) = @_;	1968	my ($path, $origin) = @_;
1813		1969
1814	$path = normalise $path, $origin && $origin->path;	1970	$path = normalise $path, $origin && $origin->path;
1815		1971
		1972	cf::lock_wait "map_data:$path";#d#remove
1816	cf::lock_wait "map_find:$path";	1973	cf::lock_wait "map_find:$path";
1817		1974
1818	$cf::MAP{$path} \|\| do {	1975	$cf::MAP{$path} \|\| do {
1819	my $guard = cf::lock_acquire "map_find:$path";	1976	my $guard1 = cf::lock_acquire "map_find:$path";
		1977	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1978
1820	my $map = new_from_path cf::map $path	1979	my $map = new_from_path cf::map $path
1821	or return;	1980	or return;
1822		1981
1823	$map->{last_save} = $cf::RUNTIME;	1982	$map->{last_save} = $cf::RUNTIME;
1824		1983
…		…
1826	or return;	1985	or return;
1827		1986
1828	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1987	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829	# doing this can freeze the server in a sync job, obviously	1988	# doing this can freeze the server in a sync job, obviously
1830	#$cf::WAIT_FOR_TICK->wait;	1989	#$cf::WAIT_FOR_TICK->wait;
		1990	undef $guard1;
		1991	undef $guard2;
1831	$map->reset;	1992	$map->reset;
1832	undef $guard;
1833	return find $path;	1993	return find $path;
1834	}	1994	}
1835		1995
1836	$cf::MAP{$path} = $map	1996	$cf::MAP{$path} = $map
1837	}	1997	}
…		…
1846	local $self->{deny_reset} = 1; # loading can take a long time	2006	local $self->{deny_reset} = 1; # loading can take a long time
1847		2007
1848	my $path = $self->{path};	2008	my $path = $self->{path};
1849		2009
1850	{	2010	{
1851	my $guard = cf::lock_acquire "map_load:$path";	2011	my $guard = cf::lock_acquire "map_data:$path";
1852		2012
		2013	return unless $self->valid;
1853	return if $self->in_memory != cf::MAP_SWAPPED;	2014	return unless $self->in_memory == cf::MAP_SWAPPED;
1854		2015
1855	$self->in_memory (cf::MAP_LOADING);	2016	$self->in_memory (cf::MAP_LOADING);
1856		2017
1857	$self->alloc;	2018	$self->alloc;
1858		2019
1859	$self->pre_load;	2020	$self->pre_load;
1860	Coro::cede;	2021	cf::cede_to_tick;
1861		2022
		2023	my $f = new_from_file cf::object::thawer $self->{load_path};
		2024	$f->skip_block;
1862	$self->_load_objects ($self->{load_path}, 1)	2025	$self->_load_objects ($f)
1863	or return;	2026	or return;
1864		2027
1865	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2028	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866	if delete $self->{load_original};	2029	if delete $self->{load_original};
1867		2030
1868	if (my $uniq = $self->uniq_path) {	2031	if (my $uniq = $self->uniq_path) {
1869	utf8::encode $uniq;	2032	utf8::encode $uniq;
1870	if (aio_open $uniq, O_RDONLY, 0) {	2033	unless (aio_stat $uniq) {
		2034	if (my $f = new_from_file cf::object::thawer $uniq) {
1871	$self->clear_unique_items;	2035	$self->clear_unique_items;
1872	$self->_load_objects ($uniq, 0);	2036	$self->_load_objects ($f);
		2037	$f->resolve_delayed_derefs;
		2038	}
1873	}	2039	}
1874	}	2040	}
1875		2041
1876	Coro::cede;	2042	$f->resolve_delayed_derefs;
		2043
		2044	cf::cede_to_tick;
1877	# now do the right thing for maps	2045	# now do the right thing for maps
1878	$self->link_multipart_objects;	2046	$self->link_multipart_objects;
1879	$self->difficulty ($self->estimate_difficulty)	2047	$self->difficulty ($self->estimate_difficulty)
1880	unless $self->difficulty;	2048	unless $self->difficulty;
1881	Coro::cede;	2049	cf::cede_to_tick;
1882		2050
1883	unless ($self->{deny_activate}) {	2051	unless ($self->{deny_activate}) {
1884	$self->decay_objects;	2052	$self->decay_objects;
1885	$self->fix_auto_apply;	2053	$self->fix_auto_apply;
1886	$self->update_buttons;	2054	$self->update_buttons;
1887	Coro::cede;	2055	cf::cede_to_tick;
1888	$self->set_darkness_map;	2056	$self->set_darkness_map;
1889	Coro::cede;	2057	cf::cede_to_tick;
1890	$self->activate;	2058	$self->activate;
1891	}	2059	}
1892		2060
1893	$self->{last_save} = $cf::RUNTIME;	2061	$self->{last_save} = $cf::RUNTIME;
1894	$self->last_access ($cf::RUNTIME);	2062	$self->last_access ($cf::RUNTIME);
…		…
1944	}	2112	}
1945		2113
1946	sub do_load_sync {	2114	sub do_load_sync {
1947	my ($map) = @_;	2115	my ($map) = @_;
1948		2116
		2117	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2118	if $Coro::current == $Coro::main;
		2119
1949	cf::sync_job { $map->load };	2120	cf::sync_job { $map->load };
1950	}	2121	}
1951		2122
1952	our %MAP_PREFETCH;	2123	our %MAP_PREFETCH;
1953	our $MAP_PREFETCHER = undef;	2124	our $MAP_PREFETCHER = undef;
1954		2125
1955	sub find_async {	2126	sub find_async {
1956	my ($path, $origin) = @_;	2127	my ($path, $origin, $load) = @_;
1957		2128
1958	$path = normalise $path, $origin && $origin->{path};	2129	$path = normalise $path, $origin && $origin->{path};
1959		2130
1960	if (my $map = $cf::MAP{$path}) {	2131	if (my $map = $cf::MAP{$path}) {
1961	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2132	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1962	}	2133	}
1963		2134
1964	undef $MAP_PREFETCH{$path};	2135	$MAP_PREFETCH{$path} \|= $load;
		2136
1965	$MAP_PREFETCHER \|\|= cf::async {	2137	$MAP_PREFETCHER \|\|= cf::async {
		2138	$Coro::current->{desc} = "map prefetcher";
		2139
1966	while (%MAP_PREFETCH) {	2140	while (%MAP_PREFETCH) {
1967	for my $path (keys %MAP_PREFETCH) {	2141	while (my ($k, $v) = each %MAP_PREFETCH) {
1968	if (my $map = find $path) {	2142	if (my $map = find $k) {
1969	$map->load;	2143	$map->load if $v;
1970	}	2144	}
1971		2145
1972	delete $MAP_PREFETCH{$path};	2146	delete $MAP_PREFETCH{$k};
1973	}	2147	}
1974	}	2148	}
1975	undef $MAP_PREFETCHER;	2149	undef $MAP_PREFETCHER;
1976	};	2150	};
1977	$MAP_PREFETCHER->prio (6);	2151	$MAP_PREFETCHER->prio (6);
…		…
1980	}	2154	}
1981		2155
1982	sub save {	2156	sub save {
1983	my ($self) = @_;	2157	my ($self) = @_;
1984		2158
1985	my $lock = cf::lock_acquire "map_data:" . $self->path;	2159	my $lock = cf::lock_acquire "map_data:$self->{path}";
1986		2160
1987	$self->{last_save} = $cf::RUNTIME;	2161	$self->{last_save} = $cf::RUNTIME;
1988		2162
1989	return unless $self->dirty;	2163	return unless $self->dirty;
1990		2164
…		…
1996	return if $self->{deny_save};	2170	return if $self->{deny_save};
1997		2171
1998	local $self->{last_access} = $self->last_access;#d#	2172	local $self->{last_access} = $self->last_access;#d#
1999		2173
2000	cf::async {	2174	cf::async {
		2175	$Coro::current->{desc} = "map player save";
2001	$_->contr->save for $self->players;	2176	$_->contr->save for $self->players;
2002	};	2177	};
2003		2178
2004	if ($uniq) {	2179	if ($uniq) {
2005	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2180	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
2013	my ($self) = @_;	2188	my ($self) = @_;
2014		2189
2015	# save first because save cedes	2190	# save first because save cedes
2016	$self->save;	2191	$self->save;
2017		2192
2018	my $lock = cf::lock_acquire "map_data:" . $self->path;	2193	my $lock = cf::lock_acquire "map_data:$self->{path}";
2019		2194
2020	return if $self->players;	2195	return if $self->players;
2021	return if $self->in_memory != cf::MAP_IN_MEMORY;	2196	return if $self->in_memory != cf::MAP_IN_MEMORY;
2022	return if $self->{deny_save};	2197	return if $self->{deny_save};
2023		2198
		2199	$self->in_memory (cf::MAP_SWAPPED);
		2200
		2201	$self->deactivate;
		2202	$_->clear_links_to ($self) for values %cf::MAP;
2024	$self->clear;	2203	$self->clear;
2025	$self->in_memory (cf::MAP_SWAPPED);
2026	}	2204	}
2027		2205
2028	sub reset_at {	2206	sub reset_at {
2029	my ($self) = @_;	2207	my ($self) = @_;
2030		2208
…		…
2062	if $uniq;	2240	if $uniq;
2063	}	2241	}
2064		2242
2065	delete $cf::MAP{$self->path};	2243	delete $cf::MAP{$self->path};
2066		2244
		2245	$self->deactivate;
		2246	$_->clear_links_to ($self) for values %cf::MAP;
2067	$self->clear;	2247	$self->clear;
2068
2069	$_->clear_links_to ($self) for values %cf::MAP;
2070		2248
2071	$self->unlink_save;	2249	$self->unlink_save;
2072	$self->destroy;	2250	$self->destroy;
2073	}	2251	}
2074		2252
2075	my $nuke_counter = "aaaa";	2253	my $nuke_counter = "aaaa";
2076		2254
2077	sub nuke {	2255	sub nuke {
2078	my ($self) = @_;	2256	my ($self) = @_;
2079		2257
		2258	{
		2259	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2260
2080	delete $cf::MAP{$self->path};	2261	delete $cf::MAP{$self->path};
2081		2262
2082	$self->unlink_save;	2263	$self->unlink_save;
2083		2264
2084	bless $self, "cf::map";	2265	bless $self, "cf::map";
2085	delete $self->{deny_reset};	2266	delete $self->{deny_reset};
2086	$self->{deny_save} = 1;	2267	$self->{deny_save} = 1;
2087	$self->reset_timeout (1);	2268	$self->reset_timeout (1);
2088	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2269	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089		2270
2090	$cf::MAP{$self->path} = $self;	2271	$cf::MAP{$self->path} = $self;
		2272	}
2091		2273
2092	$self->reset; # polite request, might not happen	2274	$self->reset; # polite request, might not happen
2093	}	2275	}
2094		2276
2095	=item $maps = cf::map::tmp_maps	2277	=item $maps = cf::map::tmp_maps
…		…
2171		2353
2172	sub inv_recursive {	2354	sub inv_recursive {
2173	inv_recursive_ inv $_[0]	2355	inv_recursive_ inv $_[0]
2174	}	2356	}
2175		2357
		2358	=item $ref = $ob->ref
		2359
		2360	creates and returns a persistent reference to an objetc that can be stored as a string.
		2361
		2362	=item $ob = cf::object::deref ($refstring)
		2363
		2364	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2365	even if the object actually exists. May block.
		2366
		2367	=cut
		2368
		2369	sub deref {
		2370	my ($ref) = @_;
		2371
		2372	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2373	my ($uuid, $name) = ($1, $2);
		2374	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2375	or return;
		2376	$pl->ob->uuid eq $uuid
		2377	or return;
		2378
		2379	$pl->ob
		2380	} else {
		2381	warn "$ref: cannot resolve object reference\n";
		2382	undef
		2383	}
		2384	}
		2385
2176	package cf;	2386	package cf;
2177		2387
2178	=back	2388	=back
2179		2389
2180	=head3 cf::object::player	2390	=head3 cf::object::player
…		…
2338	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2548	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339		2549
2340	$self->enter_link;	2550	$self->enter_link;
2341		2551
2342	(async {	2552	(async {
		2553	$Coro::current->{desc} = "player::goto $path $x $y";
		2554
		2555	# *tag paths override both path and x\|y
		2556	if ($path =~ /^\(.)$/) {
		2557	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2558	my $ob = $obs[rand @obs];
		2559
		2560	# see if we actually can go there
		2561	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2562	$ob = $obs[rand @obs];
		2563	} else {
		2564	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2565	}
		2566	# else put us there anyways for now #d#
		2567
		2568	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2569	} else {
		2570	($path, $x, $y) = (undef, undef, undef);
		2571	}
		2572	}
		2573
2343	my $map = eval {	2574	my $map = eval {
2344	my $map = cf::map::find $path;	2575	my $map = defined $path ? cf::map::find $path : undef;
2345		2576
2346	if ($map) {	2577	if ($map) {
2347	$map = $map->customise_for ($self);	2578	$map = $map->customise_for ($self);
2348	$map = $check->($map) if $check && $map;	2579	$map = $check->($map) if $check && $map;
2349	} else {	2580	} else {
2350	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2581	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2351	}	2582	}
2352		2583
2353	$map	2584	$map
2354	};	2585	};
2355		2586
…		…
2408	$rmp->{origin_y} = $exit->y;	2639	$rmp->{origin_y} = $exit->y;
2409	}	2640	}
2410		2641
2411	$rmp->{random_seed} \|\|= $exit->random_seed;	2642	$rmp->{random_seed} \|\|= $exit->random_seed;
2412		2643
2413	my $data = cf::to_json $rmp;	2644	my $data = cf::encode_json $rmp;
2414	my $md5 = Digest::MD5::md5_hex $data;	2645	my $md5 = Digest::MD5::md5_hex $data;
2415	my $meta = "$RANDOMDIR/$md5.meta";	2646	my $meta = "$RANDOMDIR/$md5.meta";
2416		2647
2417	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2648	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
2418	aio_write $fh, 0, (length $data), $data, 0;	2649	aio_write $fh, 0, (length $data), $data, 0;
…		…
2445	# if exit is damned, update players death & WoR home-position	2676	# if exit is damned, update players death & WoR home-position
2446	$self->contr->savebed ($slaying, $hp, $sp)	2677	$self->contr->savebed ($slaying, $hp, $sp)
2447	if $exit->flag (FLAG_DAMNED);	2678	if $exit->flag (FLAG_DAMNED);
2448		2679
2449	(async {	2680	(async {
		2681	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2682
2450	$self->deactivate_recursive; # just to be sure	2683	$self->deactivate_recursive; # just to be sure
2451	unless (eval {	2684	unless (eval {
2452	$self->goto ($slaying, $hp, $sp);	2685	$self->goto ($slaying, $hp, $sp);
2453		2686
2454	1;	2687	1;
…		…
2489	the message, with C<log> being the default. If C<$color> is negative, suppress	2722	the message, with C<log> being the default. If C<$color> is negative, suppress
2490	the message unless the client supports the msg packet.	2723	the message unless the client supports the msg packet.
2491		2724
2492	=cut	2725	=cut
2493		2726
		2727	# non-persistent channels (usually the info channel)
		2728	our %CHANNEL = (
		2729	"c/identify" => {
		2730	id => "infobox",
		2731	title => "Identify",
		2732	reply => undef,
		2733	tooltip => "Items recently identified",
		2734	},
		2735	"c/examine" => {
		2736	id => "infobox",
		2737	title => "Examine",
		2738	reply => undef,
		2739	tooltip => "Signs and other items you examined",
		2740	},
		2741	"c/book" => {
		2742	id => "infobox",
		2743	title => "Book",
		2744	reply => undef,
		2745	tooltip => "The contents of a note or book",
		2746	},
		2747	"c/lookat" => {
		2748	id => "infobox",
		2749	title => "Look",
		2750	reply => undef,
		2751	tooltip => "What you saw there",
		2752	},
		2753	"c/who" => {
		2754	id => "infobox",
		2755	title => "Players",
		2756	reply => undef,
		2757	tooltip => "Shows players who are currently online",
		2758	},
		2759	"c/body" => {
		2760	id => "infobox",
		2761	title => "Body Parts",
		2762	reply => undef,
		2763	tooltip => "Shows which body parts you posess and are available",
		2764	},
		2765	"c/uptime" => {
		2766	id => "infobox",
		2767	title => "Uptime",
		2768	reply => undef,
		2769	tooltip => "How long the server has been running since last restart",
		2770	},
		2771	"c/mapinfo" => {
		2772	id => "infobox",
		2773	title => "Map Info",
		2774	reply => undef,
		2775	tooltip => "Information related to the maps",
		2776	},
		2777	);
		2778
2494	sub cf::client::send_msg {	2779	sub cf::client::send_msg {
2495	my ($self, $channel, $msg, $color, @extra) = @_;	2780	my ($self, $channel, $msg, $color, @extra) = @_;
2496		2781
2497	$msg = $self->pl->expand_cfpod ($msg);	2782	$msg = $self->pl->expand_cfpod ($msg);
2498		2783
2499	$color &= cf::NDI_CLIENT_MASK; # just in case...	2784	$color &= cf::NDI_CLIENT_MASK; # just in case...
2500		2785
		2786	# check predefined channels, for the benefit of C
		2787	if ($CHANNEL{$channel}) {
		2788	$channel = $CHANNEL{$channel};
		2789
		2790	$self->ext_msg (channel_info => $channel)
		2791	if $self->can_msg;
		2792
		2793	$channel = $channel->{id};
		2794
2501	if (ref $channel) {	2795	} elsif (ref $channel) {
2502	# send meta info to client, if not yet sent	2796	# send meta info to client, if not yet sent
2503	unless (exists $self->{channel}{$channel->{id}}) {	2797	unless (exists $self->{channel}{$channel->{id}}) {
2504	$self->{channel}{$channel->{id}} = $channel;	2798	$self->{channel}{$channel->{id}} = $channel;
2505	$self->ext_msg (channel_info => $channel);	2799	$self->ext_msg (channel_info => $channel)
		2800	if $self->can_msg;
2506	}	2801	}
2507		2802
2508	$channel = $channel->{id};	2803	$channel = $channel->{id};
2509	}	2804	}
2510		2805
…		…
2551	=cut	2846	=cut
2552		2847
2553	sub cf::client::ext_msg($$@) {	2848	sub cf::client::ext_msg($$@) {
2554	my ($self, $type, @msg) = @_;	2849	my ($self, $type, @msg) = @_;
2555		2850
2556	my $extcmd = $self->extcmd;
2557
2558	if ($extcmd == 2) {	2851	if ($self->extcmd == 2) {
2559	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	2852	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560	} elsif ($extcmd == 1) { # TODO: remove	2853	} elsif ($self->extcmd == 1) { # TODO: remove
2561	push @msg, msgtype => "event_$type";	2854	push @msg, msgtype => "event_$type";
2562	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2855	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563	}	2856	}
2564	}	2857	}
2565		2858
…		…
2572	sub cf::client::ext_reply($$@) {	2865	sub cf::client::ext_reply($$@) {
2573	my ($self, $id, @msg) = @_;	2866	my ($self, $id, @msg) = @_;
2574		2867
2575	if ($self->extcmd == 2) {	2868	if ($self->extcmd == 2) {
2576	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	2869	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577	} elsif ($self->ns->extcmd == 1) {	2870	} elsif ($self->extcmd == 1) {
2578	#TODO: version 1, remove	2871	#TODO: version 1, remove
2579	unshift @msg, msgtype => "reply", msgid => $id;	2872	unshift @msg, msgtype => "reply", msgid => $id;
2580	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	2873	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581	}	2874	}
2582	}	2875	}
…		…
2646	my ($type, $reply, @payload) =	2939	my ($type, $reply, @payload) =
2647	"ARRAY" eq ref $msg	2940	"ARRAY" eq ref $msg
2648	? @$msg	2941	? @$msg
2649	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove	2942	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650		2943
		2944	my @reply;
		2945
2651	if (my $cb = $EXTICMD{$type}) {	2946	if (my $cb = $EXTICMD{$type}) {
2652	my @reply = $cb->($ns, @payload);	2947	@reply = $cb->($ns, @payload);
2653
2654	$ns->ext_reply ($reply, @reply)
2655	if $reply;
2656	}	2948	}
		2949
		2950	$ns->ext_reply ($reply, @reply)
		2951	if $reply;
		2952
2657	} else {	2953	} else {
2658	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2954	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659	}	2955	}
2660		2956
2661	cf::override;	2957	cf::override;
…		…
2721	=pod	3017	=pod
2722		3018
2723	The following functions and methods are available within a safe environment:	3019	The following functions and methods are available within a safe environment:
2724		3020
2725	cf::object	3021	cf::object
2726	contr pay_amount pay_player map x y force_find force_add	3022	contr pay_amount pay_player map x y force_find force_add destroy
2727	insert remove name archname title slaying race	3023	insert remove name archname title slaying race decrease_ob_nr
2728		3024
2729	cf::object::player	3025	cf::object::player
2730	player	3026	player
2731		3027
2732	cf::player	3028	cf::player
…		…
2737		3033
2738	=cut	3034	=cut
2739		3035
2740	for (	3036	for (
2741	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3037	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742	insert remove inv name archname title slaying race)],	3038	insert remove inv name archname title slaying race
		3039	decrease_ob_nr destroy)],
2743	["cf::object::player" => qw(player)],	3040	["cf::object::player" => qw(player)],
2744	["cf::player" => qw(peaceful)],	3041	["cf::player" => qw(peaceful)],
2745	["cf::map" => qw(trigger)],	3042	["cf::map" => qw(trigger)],
2746	) {	3043	) {
2747	no strict 'refs';	3044	no strict 'refs';
…		…
2823	# the server's init and main functions	3120	# the server's init and main functions
2824		3121
2825	sub load_facedata($) {	3122	sub load_facedata($) {
2826	my ($path) = @_;	3123	my ($path) = @_;
2827		3124
		3125	# HACK to clear player env face cache, we need some signal framework
		3126	# for this (global event?)
		3127	%ext::player_env::MUSIC_FACE_CACHE = ();
		3128
2828	my $enc = JSON::XS->new->utf8->canonical;	3129	my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829		3130
2830	warn "loading facedata from $path\n";	3131	warn "loading facedata from $path\n";
2831		3132
2832	my $facedata;	3133	my $facedata;
2833	0 < aio_load $path, $facedata	3134	0 < aio_load $path, $facedata
…		…
2839	or cf::cleanup "$path: version mismatch, cannot proceed.";	3140	or cf::cleanup "$path: version mismatch, cannot proceed.";
2840		3141
2841	# patch in the exptable	3142	# patch in the exptable
2842	$facedata->{resource}{"res/exp_table"} = {	3143	$facedata->{resource}{"res/exp_table"} = {
2843	type => FT_RSRC,	3144	type => FT_RSRC,
2844	data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),	3145	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845	};	3146	};
2846	cf::cede_to_tick;	3147	cf::cede_to_tick;
2847		3148
2848	{	3149	{
2849	my $faces = $facedata->{faceinfo};	3150	my $faces = $facedata->{faceinfo};
…		…
2902	name => $name,	3203	name => $name,
2903	%{ $info->{meta} \|\| {} },	3204	%{ $info->{meta} \|\| {} },
2904	});	3205	});
2905		3206
2906	$data = pack "(w/a)", $meta, $info->{data};	3207	$data = pack "(w/a)", $meta, $info->{data};
		3208	} else {
		3209	$data = $info->{data};
2907	}	3210	}
2908		3211
2909	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;	3212	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910	cf::face::set_type $idx, $info->{type};	3213	cf::face::set_type $idx, $info->{type};
2911		3214
…		…
2941	$ns->fx_want ($k, $v);	3244	$ns->fx_want ($k, $v);
2942	}	3245	}
2943	};	3246	};
2944		3247
2945	sub reload_regions {	3248	sub reload_regions {
		3249	# HACK to clear player env face cache, we need some signal framework
		3250	# for this (global event?)
		3251	%ext::player_env::MUSIC_FACE_CACHE = ();
		3252
2946	load_resource_file "$MAPDIR/regions"	3253	load_resource_file "$MAPDIR/regions"
2947	or die "unable to load regions file\n";	3254	or die "unable to load regions file\n";
2948		3255
2949	for (cf::region::list) {	3256	for (cf::region::list) {
2950	$_->{match} = qr/$_->{match}/	3257	$_->{match} = qr/$_->{match}/
…		…
2986		3293
2987	sub init {	3294	sub init {
2988	reload_resources;	3295	reload_resources;
2989	}	3296	}
2990		3297
2991	sub cfg_load {	3298	sub reload_config {
2992	open my $fh, "<:utf8", "$CONFDIR/config"	3299	open my $fh, "<:utf8", "$CONFDIR/config"
2993	or return;	3300	or return;
2994		3301
2995	local $/;	3302	local $/;
2996	*CFG = YAML::Syck::Load <$fh>;	3303	*CFG = YAML::Syck::Load <$fh>;
…		…
3012	sub main {	3319	sub main {
3013	# we must not ever block the main coroutine	3320	# we must not ever block the main coroutine
3014	local $Coro::idle = sub {	3321	local $Coro::idle = sub {
3015	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3322	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3016	(async {	3323	(async {
3017	Event::one_event;	3324	$Coro::current->{desc} = "IDLE BUG HANDLER";
		3325	EV::loop EV::LOOP_ONESHOT;
3018	})->prio (Coro::PRIO_MAX);	3326	})->prio (Coro::PRIO_MAX);
3019	};	3327	};
3020		3328
3021	cfg_load;	3329	reload_config;
3022	db_init;	3330	db_init;
3023	load_extensions;	3331	load_extensions;
3024		3332
3025	$TICK_WATCHER->start;	3333	$TICK_WATCHER->start;
		3334	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3026	Event::loop;	3335	EV::loop;
3027	}	3336	}
3028		3337
3029	#############################################################################	3338	#############################################################################
3030	# initialisation and cleanup	3339	# initialisation and cleanup
3031		3340
3032	# install some emergency cleanup handlers	3341	# install some emergency cleanup handlers
3033	BEGIN {	3342	BEGIN {
		3343	our %SIGWATCHER = ();
3034	for my $signal (qw(INT HUP TERM)) {	3344	for my $signal (qw(INT HUP TERM)) {
3035	Event->signal (	3345	$SIGWATCHER{$signal} = EV::signal $signal, sub {
3036	reentrant => 0,
3037	data => WF_AUTOCANCEL,
3038	signal => $signal,
3039	prio => 0,
3040	cb => sub {
3041	cf::cleanup "SIG$signal";	3346	cf::cleanup "SIG$signal";
3042	},
3043	);	3347	};
3044	}	3348	}
3045	}	3349	}
3046		3350
3047	sub write_runtime {	3351	sub write_runtime {
3048	my $runtime = "$LOCALDIR/runtime";	3352	my $runtime = "$LOCALDIR/runtime";
…		…
3093	# and maps saved/destroyed asynchronously.	3397	# and maps saved/destroyed asynchronously.
3094	warn "begin emergency player save\n";	3398	warn "begin emergency player save\n";
3095	for my $login (keys %cf::PLAYER) {	3399	for my $login (keys %cf::PLAYER) {
3096	my $pl = $cf::PLAYER{$login} or next;	3400	my $pl = $cf::PLAYER{$login} or next;
3097	$pl->valid or next;	3401	$pl->valid or next;
		3402	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3098	$pl->save;	3403	$pl->save;
3099	}	3404	}
3100	warn "end emergency player save\n";	3405	warn "end emergency player save\n";
3101		3406
3102	warn "begin emergency map save\n";	3407	warn "begin emergency map save\n";
…		…
3141	warn "syncing database to disk";	3446	warn "syncing database to disk";
3142	BDB::db_env_txn_checkpoint $DB_ENV;	3447	BDB::db_env_txn_checkpoint $DB_ENV;
3143		3448
3144	# if anything goes wrong in here, we should simply crash as we already saved	3449	# if anything goes wrong in here, we should simply crash as we already saved
3145		3450
3146	warn "cancelling all WF_AUTOCANCEL watchers";
3147	for (Event::all_watchers) {
3148	$_->cancel if $_->data & WF_AUTOCANCEL;
3149	}
3150
3151	warn "flushing outstanding aio requests";	3451	warn "flushing outstanding aio requests";
3152	for (;;) {	3452	for (;;) {
3153	BDB::flush;	3453	BDB::flush;
3154	IO::AIO::flush;	3454	IO::AIO::flush;
3155	Coro::cede;	3455	Coro::cede_notself;
3156	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3456	last unless IO::AIO::nreqs \|\| BDB::nreqs;
3157	warn "iterate...";	3457	warn "iterate...";
3158	}	3458	}
3159		3459
3160	++$RELOAD;	3460	++$RELOAD;
…		…
3219	warn "reloading cf.pm";	3519	warn "reloading cf.pm";
3220	require cf;	3520	require cf;
3221	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3521	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3222		3522
3223	warn "loading config and database again";	3523	warn "loading config and database again";
3224	cf::cfg_load;	3524	cf::reload_config;
3225		3525
3226	warn "loading extensions";	3526	warn "loading extensions";
3227	cf::load_extensions;	3527	cf::load_extensions;
3228		3528
3229	warn "reattaching attachments to objects/players";	3529	warn "reattaching attachments to objects/players";
…		…
3249		3549
3250	sub reload_perl() {	3550	sub reload_perl() {
3251	# doing reload synchronously and two reloads happen back-to-back,	3551	# doing reload synchronously and two reloads happen back-to-back,
3252	# coro crashes during coro_state_free->destroy here.	3552	# coro crashes during coro_state_free->destroy here.
3253		3553
3254	$RELOAD_WATCHER \|\|= Event->timer (	3554	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {
3255	reentrant => 0,
3256	after => 0,
3257	data => WF_AUTOCANCEL,
3258	cb => sub {
3259	do_reload_perl;
3260	undef $RELOAD_WATCHER;	3555	undef $RELOAD_WATCHER;
3261	},	3556	do_reload_perl;
3262	);	3557	};
3263	}	3558	}
3264		3559
3265	register_command "reload" => sub {	3560	register_command "reload" => sub {
3266	my ($who, $arg) = @_;	3561	my ($who, $arg) = @_;
3267		3562
3268	if ($who->flag (FLAG_WIZ)) {	3563	if ($who->flag (FLAG_WIZ)) {
3269	$who->message ("reloading server.");	3564	$who->message ("reloading server.");
		3565	async {
		3566	$Coro::current->{desc} = "perl_reload";
3270	async { reload_perl };	3567	reload_perl;
		3568	};
3271	}	3569	}
3272	};	3570	};
3273		3571
3274	unshift @INC, $LIBDIR;	3572	unshift @INC, $LIBDIR;
3275		3573
…		…
3294	my $signal = new Coro::Signal;	3592	my $signal = new Coro::Signal;
3295	push @WAIT_FOR_TICK_BEGIN, $signal;	3593	push @WAIT_FOR_TICK_BEGIN, $signal;
3296	$signal->wait;	3594	$signal->wait;
3297	}	3595	}
3298		3596
3299	my $min = 1e6;#d#	3597	$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3300	my $avg = 10;
3301	$TICK_WATCHER = Event->timer (
3302	reentrant => 0,
3303	parked => 1,
3304	prio => 0,
3305	at => $NEXT_TICK \|\| $TICK,
3306	data => WF_AUTOCANCEL,
3307	cb => sub {
3308	if ($Coro::current != $Coro::main) {	3598	if ($Coro::current != $Coro::main) {
3309	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3599	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3310	unless ++$bug_warning > 10;	3600	unless ++$bug_warning > 10;
3311	return;	3601	return;
3312	}	3602	}
3313		3603
3314	$NOW = $tick_start = Event::time;	3604	$NOW = $tick_start = EV::now;
3315		3605
3316	cf::server_tick; # one server iteration	3606	cf::server_tick; # one server iteration
3317		3607
3318	0 && sync_job {#d#	3608	$RUNTIME += $TICK;
3319	for(1..10) {	3609	$NEXT_TICK += $TICK;
3320	my $t = Event::time;
3321	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3322	or die;
3323		3610
3324	$map->width (50);	3611	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3325	$map->height (50);	3612	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3326	$map->alloc;	3613	Coro::async_pool {
3327	$map->_load_objects ("/tmp/x.map", 1);	3614	$Coro::current->{desc} = "runtime saver";
3328	my $t = Event::time - $t;	3615	write_runtime
3329		3616	or warn "ERROR: unable to write runtime file: $!";
3330	#next unless $t < 0.0013;#d#
3331	if ($t < $min) {
3332	$min = $t;
3333	}
3334	$avg = $avg * 0.99 + $t * 0.01;
3335	}
3336	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3337	exit 0;
3338	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3339	};	3617	};
		3618	}
3340		3619
3341	$RUNTIME += $TICK;
3342	$NEXT_TICK += $TICK;
3343
3344	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3345	$NEXT_RUNTIME_WRITE = $NOW + 10;
3346	Coro::async_pool {
3347	write_runtime
3348	or warn "ERROR: unable to write runtime file: $!";
3349	};
3350	}
3351
3352	# my $AFTER = Event::time;
3353	# warn $AFTER - $NOW;#d#
3354
3355	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3620	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3356	$sig->send;	3621	$sig->send;
3357	}	3622	}
3358	while (my $sig = shift @WAIT_FOR_TICK) {	3623	while (my $sig = shift @WAIT_FOR_TICK) {
3359	$sig->send;	3624	$sig->send;
3360	}	3625	}
3361		3626
3362	$NOW = Event::time;
3363
3364	# if we are delayed by four ticks or more, skip them all
3365	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3366
3367	$TICK_WATCHER->at ($NEXT_TICK);
3368	$TICK_WATCHER->start;
3369
3370	$LOAD = ($NOW - $tick_start) / $TICK;	3627	$LOAD = ($NOW - $tick_start) / $TICK;
3371	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3628	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3372		3629
3373	_post_tick;	3630	_post_tick;
3374		3631	};
3375		3632	$TICK_WATCHER->priority (EV::MAXPRI);
3376	},
3377	);
3378		3633
3379	{	3634	{
3380	BDB::max_poll_time $TICK * 0.1;	3635	# configure BDB
3381	$BDB_POLL_WATCHER = Event->io (	3636
3382	reentrant => 0,
3383	fd => BDB::poll_fileno,
3384	poll => 'r',
3385	prio => 0,
3386	data => WF_AUTOCANCEL,
3387	cb => \&BDB::poll_cb,
3388	);
3389	BDB::min_parallel 8;	3637	BDB::min_parallel 8;
3390		3638	BDB::max_poll_reqs $TICK * 0.1;
3391	BDB::set_sync_prepare {	3639	$Coro::BDB::WATCHER->priority (1);
3392	my $status;
3393	my $current = $Coro::current;
3394	(
3395	sub {
3396	$status = $!;
3397	$current->ready; undef $current;
3398	},
3399	sub {
3400	Coro::schedule while defined $current;
3401	$! = $status;
3402	},
3403	)
3404	};
3405		3640
3406	unless ($DB_ENV) {	3641	unless ($DB_ENV) {
3407	$DB_ENV = BDB::db_env_create;	3642	$DB_ENV = BDB::db_env_create;
		3643	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3644	\| BDB::LOG_AUTOREMOVE, 1);
		3645	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3646	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3408		3647
3409	cf::sync_job {	3648	cf::sync_job {
3410	eval {	3649	eval {
3411	BDB::db_env_open	3650	BDB::db_env_open
3412	$DB_ENV,	3651	$DB_ENV,
…		…
3414	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3653	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3415	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3654	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3416	0666;	3655	0666;
3417		3656
3418	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3657	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3419
3420	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3421	$DB_ENV->set_lk_detect;
3422	};	3658	};
3423		3659
3424	cf::cleanup "db_env_open(db): $@" if $@;	3660	cf::cleanup "db_env_open(db): $@" if $@;
3425	};	3661	};
3426	}	3662	}
		3663
		3664	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
		3665	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3666	};
		3667	$BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
		3668	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3669	};
		3670	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
		3671	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3672	};
3427	}	3673	}
3428		3674
3429	{	3675	{
		3676	# configure IO::AIO
		3677
3430	IO::AIO::min_parallel 8;	3678	IO::AIO::min_parallel 8;
3431
3432	undef $Coro::AIO::WATCHER;
3433	IO::AIO::max_poll_time $TICK * 0.1;	3679	IO::AIO::max_poll_time $TICK * 0.1;
3434	$AIO_POLL_WATCHER = Event->io (	3680	$Coro::AIO::WATCHER->priority (1);
3435	reentrant => 0,
3436	data => WF_AUTOCANCEL,
3437	fd => IO::AIO::poll_fileno,
3438	poll => 'r',
3439	prio => 6,
3440	cb => \&IO::AIO::poll_cb,
3441	);
3442	}	3681	}
3443		3682
3444	my $_log_backtrace;	3683	my $_log_backtrace;
3445		3684
3446	sub _log_backtrace {	3685	sub _log_backtrace {
…		…
3450		3689
3451	# limit the # of concurrent backtraces	3690	# limit the # of concurrent backtraces
3452	if ($_log_backtrace < 2) {	3691	if ($_log_backtrace < 2) {
3453	++$_log_backtrace;	3692	++$_log_backtrace;
3454	async {	3693	async {
		3694	$Coro::current->{desc} = "abt $msg";
		3695
3455	my @bt = fork_call {	3696	my @bt = fork_call {
3456	@addr = map { sprintf "%x", $_ } @addr;	3697	@addr = map { sprintf "%x", $_ } @addr;
3457	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3698	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3458	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3699	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3459	or die "addr2line: $!";	3700	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.336 by root, Tue Aug 21 00:31:18 2007 UTC vs. Revision 1.403 by root, Mon Dec 17 07:09:18 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.403 by root, Mon Dec 17 07:09:18 2007 UTC