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

Diff Legend

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