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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.309 by elmex, Mon Jul 16 15:27:06 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 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;
10	use Event;	9	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.61 ();	15	use Coro 4.1 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
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::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
25	use JSON::XS 1.4 ();	26	use JSON::XS ();
26	use BDB ();	27	use BDB ();
27	use Data::Dumper;	28	use Data::Dumper;
28	use Digest::MD5;	29	use Digest::MD5;
29	use Fcntl;	30	use Fcntl;
30	use YAML::Syck ();	31	use YAML::Syck ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
34	use Digest::MD5 ();	35	use Digest::MD5 ();
35		36
36	# configure various modules to our taste	37	# configure various modules to our taste
…		…
79	our $NEXT_TICK;	80	our $NEXT_TICK;
80	our $NOW;	81	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		83
83	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	88	our $DB_ENV;
85		89
86	our %CFG;	90	our %CFG;
87		91
88	our $UPTIME; $UPTIME \|\|= time;	92	our $UPTIME; $UPTIME \|\|= time;
89	our $RUNTIME;	93	our $RUNTIME;
90		94
91	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
94		98
95	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		101
…		…
167		171
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169	returns directly I<after> the tick processing (and consequently, can only wake one process	173	returns directly I<after> the tick processing (and consequently, can only wake one process
170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
172	=back	182	=back
173		183
174	=cut	184	=cut
175		185
176	BEGIN {	186	BEGIN {
…		…
180	$msg .= "\n"	190	$msg .= "\n"
181	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
182		192
183	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184		194
185	utf8::encode $msg;
186	LOG llevError, $msg;	195	LOG llevError, $msg;
187	};	196	};
188	}	197	}
189		198
190	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
265	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
266	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
268	returned.	277	returned.
269		278
		279	Locks are not recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
270	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
271	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
272		284
273	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
274		286
275	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
276		288
277	=cut	289	=cut
278		290
279	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
280		293
281	sub lock_wait($) {	294	sub lock_wait($) {
282	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
283		301
284	# wait for lock, if any	302	# wait for lock, if any
285	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	305	Coro::schedule;
…		…
293		311
294	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
295	lock_wait $key;	313	lock_wait $key;
296		314
297	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
298		317
299	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
302	}	322	}
303	}	323	}
304		324
…		…
316	};	336	};
317	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
318	$guard	338	$guard
319	}	339	}
320		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
		397	}
		398
321	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
322		400
323	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
324	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	402	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
325	thing you are allowed to do is call C<prio> on it.	403	thing you are allowed to do is call C<prio> on it.
…		…
349	my $time = Event::time;	427	my $time = Event::time;
350		428
351	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
352	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
353		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
354	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
355	# (but this is cancel-safe)	435	# (but this is cancel-safe)
356	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
357		437
358	my $busy = 1;	438	my $busy = 1;
359	my @res;	439	my @res;
360		440
361	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
362	@res = eval { $job->() };	443	@res = eval { $job->() };
363	warn $@ if $@;	444	warn $@ if $@;
364	undef $busy;	445	undef $busy;
365	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
366		447
367	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
368	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
369	}	454	}
370		455
371	$time = Event::time - $time;	456	$time = Event::time - $time;
372		457
373	LOG llevError \| logBacktrace, Carp::longmess "long sync job"	458	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
…		…
410	Coro::Storable. May, of course, block. Note that the executed sub may	495	Coro::Storable. May, of course, block. Note that the executed sub may
411	never block itself or use any form of Event handling.	496	never block itself or use any form of Event handling.
412		497
413	=cut	498	=cut
414		499
415	sub _store_scalar {
416	open my $fh, ">", \my $buf
417	or die "fork_call: cannot open fh-to-buf in child : $!";
418	Storable::store_fd $_[0], $fh;
419	close $fh;
420
421	$buf
422	}
423
424	sub fork_call(&@) {	500	sub fork_call(&@) {
425	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
426		502
427	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	503	# we seemingly have to make a local copy of the whole thing,
428	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
429	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
430	or die "pipe: $!";
431		506
432	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
433	close $fh2;
434
435	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436	warn "pst<$res>" unless $res =~ /^pst/;
437	$res = Coro::Storable::thaw $res;
438
439	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441	Carp::confess $$res unless "ARRAY" eq ref $res;
442
443	return wantarray ? @$res : $res->[-1];
444	} else {
445	reset_signals;	508	reset_signals;
446	local $SIG{__WARN__};	509	&$cb
447	local $SIG{__DIE__};	510	}, @args;
448	# just in case, this hack effectively disables event
449	# in the child. cleaner and slower would be canceling all watchers,
450	# but this works for the time being.
451	local $Coro::idle;
452	$Coro::current->prio (Coro::PRIO_MAX);
453		511
454	eval {	512	wantarray ? @res : $res[-1]
455	close $fh1;
456
457	my @res = eval { $cb->(@args) };
458
459	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460	close $fh2;
461	};
462
463	warn $@ if $@;
464	_exit 0;
465	}
466	}	513	}
467		514
468	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
469		516
470	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
472	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
473		520
474	Stores the given C<$value> in the family. It can currently store binary	521	Stores the given C<$value> in the family. It can currently store binary
475	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	522	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476		523
		524	=item $db = cf::db_table "name"
		525
		526	Create and/or open a new database table. The string must not be "db" and must be unique
		527	within each server.
		528
477	=cut	529	=cut
		530
		531	sub db_table($) {
		532	my ($name) = @_;
		533	my $db = BDB::db_create $DB_ENV;
		534
		535	eval {
		536	$db->set_flags (BDB::CHKSUM);
		537
		538	utf8::encode $name;
		539	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		540	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		541	cf::cleanup "db_open(db): $!" if $!;
		542	};
		543	cf::cleanup "db_open(db): $@" if $@;
		544
		545	$db
		546	}
478		547
479	our $DB;	548	our $DB;
480		549
481	sub db_init {	550	sub db_init {
482	unless ($DB) {
483	$DB = BDB::db_create $DB_ENV;
484
485	cf::sync_job {	551	cf::sync_job {
486	eval {	552	$DB \|\|= db_table "db";
487	$DB->set_flags (BDB::CHKSUM);
488
489	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
491	cf::cleanup "db_open(db): $!" if $!;
492	};
493	cf::cleanup "db_open(db): $@" if $@;
494	};
495	}	553	};
496	}	554	}
497		555
498	sub db_get($$) {	556	sub db_get($$) {
499	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
500		558
…		…
550	if (1) {	608	if (1) {
551	$md5 =	609	$md5 =
552	join "\x00",	610	join "\x00",
553	$processversion,	611	$processversion,
554	map {	612	map {
555	Coro::cede;	613	cf::cede_to_tick;
556	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
557	} 0.. $#$src;	615	} 0.. $#$src;
558		616
559		617
560	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
866	";	924	";
867	die if $@;	925	die if $@;
868	}	926	}
869		927
870	our $override;	928	our $override;
871	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	929	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872		930
873	sub override {	931	sub override {
874	$override = 1;	932	$override = 1;
875	@invoke_results = (@_);	933	@INVOKE_RESULTS = (@_);
876	}	934	}
877		935
878	sub do_invoke {	936	sub do_invoke {
879	my $event = shift;	937	my $event = shift;
880	my $callbacks = shift;	938	my $callbacks = shift;
881		939
882	@invoke_results = ();	940	@INVOKE_RESULTS = ();
883		941
884	local $override;	942	local $override;
885		943
886	for (@$callbacks) {	944	for (@$callbacks) {
887	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
904		962
905	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
906		964
907	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	965	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908	removed in future versions), and there is no public API to access override	966	removed in future versions), and there is no public API to access override
909	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910		968
911	=back	969	=back
912		970
913	=cut	971	=cut
914		972
915	#############################################################################	973	#############################################################################
916	# object support	974	# object support
		975
		976	sub _object_equal($$);
		977	sub _object_equal($$) {
		978	my ($a, $b) = @_;
		979
		980	return 0 unless (ref $a) eq (ref $b);
		981
		982	if ("HASH" eq ref $a) {
		983	my @ka = keys %$a;
		984	my @kb = keys %$b;
		985
		986	return 0 if @ka != @kb;
		987
		988	for (0 .. $#ka) {
		989	return 0 unless $ka[$_] eq $kb[$_];
		990	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		991	}
		992
		993	} elsif ("ARRAY" eq ref $a) {
		994
		995	return 0 if @$a != @$b;
		996
		997	for (0 .. $#$a) {
		998	return 0 unless _object_equal $a->[$_], $b->[$_];
		999	}
		1000
		1001	} elsif ($a ne $b) {
		1002	return 0;
		1003	}
		1004
		1005	1
		1006	}
		1007
		1008	our $SLOW_MERGES;#d#
		1009	sub _can_merge {
		1010	my ($ob1, $ob2) = @_;
		1011
		1012	++$SLOW_MERGES;#d#
		1013
		1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
		1016	}
917		1017
918	sub reattach {	1018	sub reattach {
919	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
920	my ($obj) = @_;	1020	my ($obj) = @_;
921		1021
…		…
968	sub object_freezer_save {	1068	sub object_freezer_save {
969	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
970		1070
971	sync_job {	1071	sync_job {
972	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
973	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
974	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
975		1076
976	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
977	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
978	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
980	close $fh;	1081	close $fh;
981		1082
982	if (@$objs) {	1083	if (@$objs) {
983	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
984	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
985	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
986	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
987	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
988	close $fh;	1089	close $fh;
989	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
990	}	1091	}
…		…
998	}	1099	}
999	} else {	1100	} else {
1000	aio_unlink $filename;	1101	aio_unlink $filename;
1001	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
1002	}	1103	}
1003	}	1104	};
1004	}	1105	}
1005		1106
1006	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1007	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1008		1109
…		…
1020	or return;	1121	or return;
1021		1122
1022	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1023	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1024	or return;	1125	or return;
1025	$av = eval { (Storable::thaw $av)->{objs} };
1026	}
1027		1126
		1127	my $st = eval { Coro::Storable::thaw $av }
		1128	\|\| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1129	$av = $st->{objs};
		1130	}
		1131
		1132	utf8::decode (my $decname = $filename);
1028	warn sprintf "loading %s (%d)\n",	1133	warn sprintf "loading %s (%d,%d)\n",
1029	$filename, length $data, scalar @{$av \|\| []};	1134	$decname, length $data, scalar @{$av \|\| []};
		1135
1030	return ($data, $av);	1136	($data, $av)
1031	}	1137	}
1032		1138
1033	=head2 COMMAND CALLBACKS	1139	=head2 COMMAND CALLBACKS
1034		1140
1035	=over 4	1141	=over 4
…		…
1108	my ($pl, $buf) = @_;	1214	my ($pl, $buf) = @_;
1109		1215
1110	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1216	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111		1217
1112	if (ref $msg) {	1218	if (ref $msg) {
		1219	my ($type, $reply, @payload) =
		1220	"ARRAY" eq ref $msg
		1221	? @$msg
		1222	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1223
		1224	my @reply;
		1225
1113	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1226	if (my $cb = $EXTCMD{$type}) {
1114	if (my %reply = $cb->($pl, $msg)) {	1227	@reply = $cb->($pl, @payload);
1115	$pl->ext_reply ($msg->{msgid}, %reply);
1116	}
1117	}	1228	}
		1229
		1230	$pl->ext_reply ($reply, @reply)
		1231	if $reply;
		1232
1118	} else {	1233	} else {
1119	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1234	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120	}	1235	}
1121		1236
1122	cf::override;	1237	cf::override;
…		…
1212		1327
1213	=head3 cf::player	1328	=head3 cf::player
1214		1329
1215	=over 4	1330	=over 4
1216		1331
		1332	=item cf::player::num_playing
		1333
		1334	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1335
		1336	=cut
		1337
		1338	sub num_playing {
		1339	scalar grep
		1340	$_->ob->map
		1341	&& !$_->hidden
		1342	&& !$_->ob->flag (cf::FLAG_WIZ),
		1343	cf::player::list
		1344	}
		1345
1217	=item cf::player::find $login	1346	=item cf::player::find $login
1218		1347
1219	Returns the given player object, loading it if necessary (might block).	1348	Returns the given player object, loading it if necessary (might block).
1220		1349
1221	=cut	1350	=cut
…		…
1256	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1385	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1386	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1387	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259	aio_unlink +(playerdir $login) . "/$login.pl";	1388	aio_unlink +(playerdir $login) . "/$login.pl";
1260		1389
1261	my $pl = load_pl path $login	1390	my $f = new_from_file cf::object::thawer path $login
1262	or return;	1391	or return;
		1392
		1393	my $pl = cf::player::load_pl $f
		1394	or return;
		1395	local $cf::PLAYER_LOADING{$login} = $pl;
		1396	$f->resolve_delayed_derefs;
1263	$cf::PLAYER{$login} = $pl	1397	$cf::PLAYER{$login} = $pl
1264	}	1398	}
1265	}	1399	}
1266	}	1400	}
1267		1401
…		…
1277		1411
1278	aio_mkdir playerdir $pl, 0770;	1412	aio_mkdir playerdir $pl, 0770;
1279	$pl->{last_save} = $cf::RUNTIME;	1413	$pl->{last_save} = $cf::RUNTIME;
1280		1414
1281	$pl->save_pl ($path);	1415	$pl->save_pl ($path);
1282	Coro::cede;	1416	cf::cede_to_tick;
1283	}	1417	}
1284		1418
1285	sub new($) {	1419	sub new($) {
1286	my ($login) = @_;	1420	my ($login) = @_;
1287		1421
…		…
1291	$self->{deny_save} = 1;	1425	$self->{deny_save} = 1;
1292		1426
1293	$cf::PLAYER{$login} = $self;	1427	$cf::PLAYER{$login} = $self;
1294		1428
1295	$self	1429	$self
		1430	}
		1431
		1432	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1433
		1434	=cut
		1435
		1436	sub send_msg {
		1437	my $ns = shift->ns
		1438	or return;
		1439	$ns->send_msg (@_);
1296	}	1440	}
1297		1441
1298	=item $pl->quit_character	1442	=item $pl->quit_character
1299		1443
1300	Nukes the player without looking back. If logged in, the connection will	1444	Nukes the player without looking back. If logged in, the connection will
…		…
1355	or return [];	1499	or return [];
1356		1500
1357	my @logins;	1501	my @logins;
1358		1502
1359	for my $login (@$dirs) {	1503	for my $login (@$dirs) {
		1504	my $path = path $login;
		1505
		1506	# a .pst is a dead give-away for a valid player
		1507	unless (-e "$path.pst") {
1360	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1508	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361	aio_read $fh, 0, 512, my $buf, 0 or next;	1509	aio_read $fh, 0, 512, my $buf, 0 or next;
1362	$buf !~ /^password -------------$/m or next; # official not-valid tag	1510	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1511	}
1363		1512
1364	utf8::decode $login;	1513	utf8::decode $login;
1365	push @logins, $login;	1514	push @logins, $login;
1366	}	1515	}
1367		1516
…		…
1405	sub expand_cfpod {	1554	sub expand_cfpod {
1406	((my $self), (local $_)) = @_;	1555	((my $self), (local $_)) = @_;
1407		1556
1408	# escape & and <	1557	# escape & and <
1409	s/&/&/g;	1558	s/&/&/g;
1410	s/(?<![BIUGH])</</g;	1559	s/(?<![BIUGHT])</</g;
1411		1560
1412	# this is buggy, it needs to properly take care of nested <'s	1561	# this is buggy, it needs to properly take care of nested <'s
1413		1562
1414	1 while	1563	1 while
1415	# replace B<>, I<>, U<> etc.	1564	# replace B<>, I<>, U<> etc.
1416	s/B<([^\>]*)>/<b>$1<\/b>/	1565	s/B<([^\>]*)>/<b>$1<\/b>/
1417	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1566	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1418	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1567	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1568	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1419	# replace G<male\|female> tags	1569	# replace G<male\|female> tags
1420	\|\| s{G<([^>\|])\\|([^>])>}{	1570	\|\| s{G<([^>\|])\\|([^>])>}{
1421	$self->gender ? $2 : $1	1571	$self->gender ? $2 : $1
1422	}ge	1572	}ge
1423	# replace H<hint text>	1573	# replace H<hint text>
…		…
1444	sub hintmode {	1594	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1595	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1596	$_[0]{hintmode}
1447	}	1597	}
1448		1598
1449	=item $player->ext_reply ($msgid, %msg)	1599	=item $player->ext_reply ($msgid, @msg)
1450		1600
1451	Sends an ext reply to the player.	1601	Sends an ext reply to the player.
1452		1602
1453	=cut	1603	=cut
1454		1604
1455	sub ext_reply($$%) {	1605	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1606	my ($self, $id, @msg) = @_;
1457		1607
1458	$msg{msgid} = $id;	1608	$self->ns->ext_reply ($id, @msg)
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460	}	1609	}
1461		1610
1462	=item $player->ext_event ($type, %msg)	1611	=item $player->ext_msg ($type, @msg)
1463		1612
1464	Sends an ext event to the client.	1613	Sends an ext event to the client.
1465		1614
1466	=cut	1615	=cut
1467		1616
1468	sub ext_event($$%) {	1617	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1618	my ($self, $type, @msg) = @_;
1470		1619
1471	$self->ns->ext_event ($type, %msg);	1620	$self->ns->ext_msg ($type, @msg);
1472	}	1621	}
1473		1622
1474	=head3 cf::region	1623	=head3 cf::region
1475		1624
1476	=over 4	1625	=over 4
…		…
1692		1841
1693	sub load_header_from($) {	1842	sub load_header_from($) {
1694	my ($self, $path) = @_;	1843	my ($self, $path) = @_;
1695		1844
1696	utf8::encode $path;	1845	utf8::encode $path;
1697	#aio_open $path, O_RDONLY, 0	1846	my $f = new_from_file cf::object::thawer $path
1698	# or return;
1699
1700	$self->_load_header ($path)
1701	or return;	1847	or return;
		1848
		1849	$self->_load_header ($f)
		1850	or return;
		1851
		1852	local $MAP_LOADING{$self->{path}} = $self;
		1853	$f->resolve_delayed_derefs;
1702		1854
1703	$self->{load_path} = $path;	1855	$self->{load_path} = $path;
1704		1856
1705	1	1857	1
1706	}	1858	}
…		…
1760	sub find {	1912	sub find {
1761	my ($path, $origin) = @_;	1913	my ($path, $origin) = @_;
1762		1914
1763	$path = normalise $path, $origin && $origin->path;	1915	$path = normalise $path, $origin && $origin->path;
1764		1916
		1917	cf::lock_wait "map_data:$path";#d#remove
1765	cf::lock_wait "map_find:$path";	1918	cf::lock_wait "map_find:$path";
1766		1919
1767	$cf::MAP{$path} \|\| do {	1920	$cf::MAP{$path} \|\| do {
1768	my $guard = cf::lock_acquire "map_find:$path";	1921	my $guard1 = cf::lock_acquire "map_find:$path";
		1922	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1923
1769	my $map = new_from_path cf::map $path	1924	my $map = new_from_path cf::map $path
1770	or return;	1925	or return;
1771		1926
1772	$map->{last_save} = $cf::RUNTIME;	1927	$map->{last_save} = $cf::RUNTIME;
1773		1928
…		…
1775	or return;	1930	or return;
1776		1931
1777	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1932	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778	# doing this can freeze the server in a sync job, obviously	1933	# doing this can freeze the server in a sync job, obviously
1779	#$cf::WAIT_FOR_TICK->wait;	1934	#$cf::WAIT_FOR_TICK->wait;
		1935	undef $guard1;
		1936	undef $guard2;
1780	$map->reset;	1937	$map->reset;
1781	undef $guard;
1782	return find $path;	1938	return find $path;
1783	}	1939	}
1784		1940
1785	$cf::MAP{$path} = $map	1941	$cf::MAP{$path} = $map
1786	}	1942	}
…		…
1795	local $self->{deny_reset} = 1; # loading can take a long time	1951	local $self->{deny_reset} = 1; # loading can take a long time
1796		1952
1797	my $path = $self->{path};	1953	my $path = $self->{path};
1798		1954
1799	{	1955	{
1800	my $guard = cf::lock_acquire "map_load:$path";	1956	my $guard = cf::lock_acquire "map_data:$path";
1801		1957
		1958	return unless $self->valid;
1802	return if $self->in_memory != cf::MAP_SWAPPED;	1959	return unless $self->in_memory == cf::MAP_SWAPPED;
1803		1960
1804	$self->in_memory (cf::MAP_LOADING);	1961	$self->in_memory (cf::MAP_LOADING);
1805		1962
1806	$self->alloc;	1963	$self->alloc;
1807		1964
1808	$self->pre_load;	1965	$self->pre_load;
1809	Coro::cede;	1966	cf::cede_to_tick;
1810		1967
		1968	my $f = new_from_file cf::object::thawer $self->{load_path};
		1969	$f->skip_block;
1811	$self->_load_objects ($self->{load_path}, 1)	1970	$self->_load_objects ($f)
1812	or return;	1971	or return;
1813		1972
1814	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1973	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815	if delete $self->{load_original};	1974	if delete $self->{load_original};
1816		1975
1817	if (my $uniq = $self->uniq_path) {	1976	if (my $uniq = $self->uniq_path) {
1818	utf8::encode $uniq;	1977	utf8::encode $uniq;
1819	if (aio_open $uniq, O_RDONLY, 0) {	1978	unless (aio_stat $uniq) {
		1979	if (my $f = new_from_file cf::object::thawer $uniq) {
1820	$self->clear_unique_items;	1980	$self->clear_unique_items;
1821	$self->_load_objects ($uniq, 0);	1981	$self->_load_objects ($f);
		1982	$f->resolve_delayed_derefs;
		1983	}
1822	}	1984	}
1823	}	1985	}
1824		1986
1825	Coro::cede;	1987	$f->resolve_delayed_derefs;
		1988
		1989	cf::cede_to_tick;
1826	# now do the right thing for maps	1990	# now do the right thing for maps
1827	$self->link_multipart_objects;	1991	$self->link_multipart_objects;
1828	$self->difficulty ($self->estimate_difficulty)	1992	$self->difficulty ($self->estimate_difficulty)
1829	unless $self->difficulty;	1993	unless $self->difficulty;
1830	Coro::cede;	1994	cf::cede_to_tick;
1831		1995
1832	unless ($self->{deny_activate}) {	1996	unless ($self->{deny_activate}) {
1833	$self->decay_objects;	1997	$self->decay_objects;
1834	$self->fix_auto_apply;	1998	$self->fix_auto_apply;
1835	$self->update_buttons;	1999	$self->update_buttons;
1836	Coro::cede;	2000	cf::cede_to_tick;
1837	$self->set_darkness_map;	2001	$self->set_darkness_map;
1838	Coro::cede;	2002	cf::cede_to_tick;
1839	$self->activate;	2003	$self->activate;
1840	}	2004	}
		2005
		2006	$self->{last_save} = $cf::RUNTIME;
		2007	$self->last_access ($cf::RUNTIME);
1841		2008
1842	$self->in_memory (cf::MAP_IN_MEMORY);	2009	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	2010	}
1844		2011
1845	$self->post_load;	2012	$self->post_load;
…		…
1856		2023
1857	$self	2024	$self
1858	}	2025	}
1859		2026
1860	# find and load all maps in the 3x3 area around a map	2027	# find and load all maps in the 3x3 area around a map
1861	sub load_diag {	2028	sub load_neighbours {
1862	my ($map) = @_;	2029	my ($map) = @_;
1863		2030
1864	my @diag; # diagonal neighbours	2031	my @neigh; # diagonal neighbours
1865		2032
1866	for (0 .. 3) {	2033	for (0 .. 3) {
1867	my $neigh = $map->tile_path ($_)	2034	my $neigh = $map->tile_path ($_)
1868	or next;	2035	or next;
1869	$neigh = find $neigh, $map	2036	$neigh = find $neigh, $map
1870	or next;	2037	or next;
1871	$neigh->load;	2038	$neigh->load;
1872		2039
		2040	push @neigh,
1873	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2041	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1874	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2042	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1875	}	2043	}
1876		2044
1877	for (@diag) {	2045	for (grep defined $_->[0], @neigh) {
		2046	my ($path, $origin) = @$_;
1878	my $neigh = find @$_	2047	my $neigh = find $path, $origin
1879	or next;	2048	or next;
1880	$neigh->load;	2049	$neigh->load;
1881	}	2050	}
1882	}	2051	}
1883		2052
…		…
1888	}	2057	}
1889		2058
1890	sub do_load_sync {	2059	sub do_load_sync {
1891	my ($map) = @_;	2060	my ($map) = @_;
1892		2061
		2062	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2063	if $Coro::current == $Coro::main;
		2064
1893	cf::sync_job { $map->load };	2065	cf::sync_job { $map->load };
1894	}	2066	}
1895		2067
1896	our %MAP_PREFETCH;	2068	our %MAP_PREFETCH;
1897	our $MAP_PREFETCHER = undef;	2069	our $MAP_PREFETCHER = undef;
1898		2070
1899	sub find_async {	2071	sub find_async {
1900	my ($path, $origin) = @_;	2072	my ($path, $origin, $load) = @_;
1901		2073
1902	$path = normalise $path, $origin && $origin->{path};	2074	$path = normalise $path, $origin && $origin->{path};
1903		2075
1904	if (my $map = $cf::MAP{$path}) {	2076	if (my $map = $cf::MAP{$path}) {
1905	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2077	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1906	}	2078	}
1907		2079
1908	undef $MAP_PREFETCH{$path};	2080	$MAP_PREFETCH{$path} \|= $load;
		2081
1909	$MAP_PREFETCHER \|\|= cf::async {	2082	$MAP_PREFETCHER \|\|= cf::async {
		2083	$Coro::current->{desc} = "map prefetcher";
		2084
1910	while (%MAP_PREFETCH) {	2085	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	2086	while (my ($k, $v) = each %MAP_PREFETCH) {
1912	if (my $map = find $path) {	2087	if (my $map = find $k) {
1913	$map->load;	2088	$map->load if $v;
1914	}	2089	}
1915		2090
1916	delete $MAP_PREFETCH{$path};	2091	delete $MAP_PREFETCH{$k};
1917	}	2092	}
1918	}	2093	}
1919	undef $MAP_PREFETCHER;	2094	undef $MAP_PREFETCHER;
1920	};	2095	};
1921	$MAP_PREFETCHER->prio (6);	2096	$MAP_PREFETCHER->prio (6);
…		…
1924	}	2099	}
1925		2100
1926	sub save {	2101	sub save {
1927	my ($self) = @_;	2102	my ($self) = @_;
1928		2103
1929	my $lock = cf::lock_acquire "map_data:" . $self->path;	2104	my $lock = cf::lock_acquire "map_data:$self->{path}";
1930		2105
1931	$self->{last_save} = $cf::RUNTIME;	2106	$self->{last_save} = $cf::RUNTIME;
1932		2107
1933	return unless $self->dirty;	2108	return unless $self->dirty;
1934		2109
…		…
1940	return if $self->{deny_save};	2115	return if $self->{deny_save};
1941		2116
1942	local $self->{last_access} = $self->last_access;#d#	2117	local $self->{last_access} = $self->last_access;#d#
1943		2118
1944	cf::async {	2119	cf::async {
		2120	$Coro::current->{desc} = "map player save";
1945	$_->contr->save for $self->players;	2121	$_->contr->save for $self->players;
1946	};	2122	};
1947		2123
1948	if ($uniq) {	2124	if ($uniq) {
1949	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2125	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1957	my ($self) = @_;	2133	my ($self) = @_;
1958		2134
1959	# save first because save cedes	2135	# save first because save cedes
1960	$self->save;	2136	$self->save;
1961		2137
1962	my $lock = cf::lock_acquire "map_data:" . $self->path;	2138	my $lock = cf::lock_acquire "map_data:$self->{path}";
1963		2139
1964	return if $self->players;	2140	return if $self->players;
1965	return if $self->in_memory != cf::MAP_IN_MEMORY;	2141	return if $self->in_memory != cf::MAP_IN_MEMORY;
1966	return if $self->{deny_save};	2142	return if $self->{deny_save};
1967		2143
		2144	$self->in_memory (cf::MAP_SWAPPED);
		2145
		2146	$self->deactivate;
		2147	$_->clear_links_to ($self) for values %cf::MAP;
1968	$self->clear;	2148	$self->clear;
1969	$self->in_memory (cf::MAP_SWAPPED);
1970	}	2149	}
1971		2150
1972	sub reset_at {	2151	sub reset_at {
1973	my ($self) = @_;	2152	my ($self) = @_;
1974		2153
…		…
2006	if $uniq;	2185	if $uniq;
2007	}	2186	}
2008		2187
2009	delete $cf::MAP{$self->path};	2188	delete $cf::MAP{$self->path};
2010		2189
		2190	$self->deactivate;
		2191	$_->clear_links_to ($self) for values %cf::MAP;
2011	$self->clear;	2192	$self->clear;
2012
2013	$_->clear_links_to ($self) for values %cf::MAP;
2014		2193
2015	$self->unlink_save;	2194	$self->unlink_save;
2016	$self->destroy;	2195	$self->destroy;
2017	}	2196	}
2018		2197
2019	my $nuke_counter = "aaaa";	2198	my $nuke_counter = "aaaa";
2020		2199
2021	sub nuke {	2200	sub nuke {
2022	my ($self) = @_;	2201	my ($self) = @_;
2023		2202
		2203	{
		2204	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2205
2024	delete $cf::MAP{$self->path};	2206	delete $cf::MAP{$self->path};
2025		2207
2026	$self->unlink_save;	2208	$self->unlink_save;
2027		2209
2028	bless $self, "cf::map";	2210	bless $self, "cf::map";
2029	delete $self->{deny_reset};	2211	delete $self->{deny_reset};
2030	$self->{deny_save} = 1;	2212	$self->{deny_save} = 1;
2031	$self->reset_timeout (1);	2213	$self->reset_timeout (1);
2032	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2214	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033		2215
2034	$cf::MAP{$self->path} = $self;	2216	$cf::MAP{$self->path} = $self;
		2217	}
2035		2218
2036	$self->reset; # polite request, might not happen	2219	$self->reset; # polite request, might not happen
2037	}	2220	}
2038		2221
2039	=item $maps = cf::map::tmp_maps	2222	=item $maps = cf::map::tmp_maps
…		…
2115		2298
2116	sub inv_recursive {	2299	sub inv_recursive {
2117	inv_recursive_ inv $_[0]	2300	inv_recursive_ inv $_[0]
2118	}	2301	}
2119		2302
		2303	=item $ref = $ob->ref
		2304
		2305	creates and returns a persistent reference to an objetc that can be stored as a string.
		2306
		2307	=item $ob = cf::object::deref ($refstring)
		2308
		2309	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2310	even if the object actually exists. May block.
		2311
		2312	=cut
		2313
		2314	sub deref {
		2315	my ($ref) = @_;
		2316
		2317	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2318	my ($uuid, $name) = ($1, $2);
		2319	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2320	or return;
		2321	$pl->ob->uuid eq $uuid
		2322	or return;
		2323
		2324	$pl->ob
		2325	} else {
		2326	warn "$ref: cannot resolve object reference\n";
		2327	undef
		2328	}
		2329	}
		2330
2120	package cf;	2331	package cf;
2121		2332
2122	=back	2333	=back
2123		2334
2124	=head3 cf::object::player	2335	=head3 cf::object::player
…		…
2146		2357
2147	} else {	2358	} else {
2148	my $pl = $self->contr;	2359	my $pl = $self->contr;
2149		2360
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2361	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2362	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2363	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153	$diag->{id},
2154	msgtype => "reply",
2155	msg => $diag->{pl}->expand_cfpod ($msg),
2156	add_topics => []
2157	);
2158		2364
2159	} else {	2365	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2366	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2367	$self->message ($msg, $flags);
2162	}	2368	}
2163	}	2369	}
		2370	}
		2371
		2372	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2373
		2374	=cut
		2375
		2376	sub cf::object::send_msg {
		2377	my $pl = shift->contr
		2378	or return;
		2379	$pl->send_msg (@_);
2164	}	2380	}
2165		2381
2166	=item $player_object->may ("access")	2382	=item $player_object->may ("access")
2167		2383
2168	Returns wether the given player is authorized to access resource "access"	2384	Returns wether the given player is authorized to access resource "access"
…		…
2247	# use -1 or undef as default coordinates, not 0, 0	2463	# use -1 or undef as default coordinates, not 0, 0
2248	($x, $y) = ($map->enter_x, $map->enter_y)	2464	($x, $y) = ($map->enter_x, $map->enter_y)
2249	if $x <=0 && $y <= 0;	2465	if $x <=0 && $y <= 0;
2250		2466
2251	$map->load;	2467	$map->load;
2252	$map->load_diag;	2468	$map->load_neighbours;
2253		2469
2254	return unless $self->contr->active;	2470	return unless $self->contr->active;
2255	$self->activate_recursive;	2471	$self->activate_recursive;
2256		2472
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2473	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2277	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2493	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278		2494
2279	$self->enter_link;	2495	$self->enter_link;
2280		2496
2281	(async {	2497	(async {
		2498	$Coro::current->{desc} = "player::goto $path $x $y";
		2499
		2500	# *tag paths override both path and x\|y
		2501	if ($path =~ /^\(.)$/) {
		2502	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2503	my $ob = $obs[rand @obs];
		2504
		2505	# see if we actually can go there
		2506	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2507	$ob = $obs[rand @obs];
		2508	} else {
		2509	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2510	}
		2511	# else put us there anyways for now #d#
		2512
		2513	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2514	} else {
		2515	($path, $x, $y) = (undef, undef, undef);
		2516	}
		2517	}
		2518
2282	my $map = eval {	2519	my $map = eval {
2283	my $map = cf::map::find $path;	2520	my $map = defined $path ? cf::map::find $path : undef;
2284		2521
2285	if ($map) {	2522	if ($map) {
2286	$map = $map->customise_for ($self);	2523	$map = $map->customise_for ($self);
2287	$map = $check->($map) if $check && $map;	2524	$map = $check->($map) if $check && $map;
2288	} else {	2525	} else {
2289	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2526	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2290	}	2527	}
2291		2528
2292	$map	2529	$map
2293	};	2530	};
2294		2531
…		…
2384	# if exit is damned, update players death & WoR home-position	2621	# if exit is damned, update players death & WoR home-position
2385	$self->contr->savebed ($slaying, $hp, $sp)	2622	$self->contr->savebed ($slaying, $hp, $sp)
2386	if $exit->flag (FLAG_DAMNED);	2623	if $exit->flag (FLAG_DAMNED);
2387		2624
2388	(async {	2625	(async {
		2626	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2627
2389	$self->deactivate_recursive; # just to be sure	2628	$self->deactivate_recursive; # just to be sure
2390	unless (eval {	2629	unless (eval {
2391	$self->goto ($slaying, $hp, $sp);	2630	$self->goto ($slaying, $hp, $sp);
2392		2631
2393	1;	2632	1;
…		…
2419		2658
2420	utf8::encode $text;	2659	utf8::encode $text;
2421	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2660	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2422	}	2661	}
2423		2662
2424	=item $client->send_msg ($color, $type, $msg, [extra...])	2663	=item $client->send_msg ($channel, $msg, $color, [extra...])
2425		2664
2426	Send a drawinfo or msg packet to the client, formatting the msg for the	2665	Send a drawinfo or msg packet to the client, formatting the msg for the
2427	client if neccessary. C<$type> should be a string identifying the type of	2666	client if neccessary. C<$type> should be a string identifying the type of
2428	the message, with C<log> being the default. If C<$color> is negative, suppress	2667	the message, with C<log> being the default. If C<$color> is negative, suppress
2429	the message unless the client supports the msg packet.	2668	the message unless the client supports the msg packet.
2430		2669
2431	=cut	2670	=cut
2432		2671
		2672	our %CHANNEL = (
		2673	"c/identify" => {
		2674	id => "infobox",
		2675	title => "Identify",
		2676	reply => undef,
		2677	tooltip => "Items recently identified",
		2678	},
		2679	"c/examine" => {
		2680	id => "infobox",
		2681	title => "Examine",
		2682	reply => undef,
		2683	tooltip => "Signs and other items you examined",
		2684	},
		2685	"c/lookat" => {
		2686	id => "infobox",
		2687	title => "Look",
		2688	reply => undef,
		2689	tooltip => "What you saw there",
		2690	},
		2691	);
		2692
2433	sub cf::client::send_msg {	2693	sub cf::client::send_msg {
2434	my ($self, $color, $type, $msg, @extra) = @_;	2694	my ($self, $channel, $msg, $color, @extra) = @_;
2435		2695
2436	$msg = $self->pl->expand_cfpod ($msg);	2696	$msg = $self->pl->expand_cfpod ($msg);
2437		2697
		2698	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2699
		2700	# check predefined channels, for the benefit of C
		2701	if ($CHANNEL{$channel}) {
		2702	$channel = $CHANNEL{$channel};
		2703
		2704	$self->ext_msg (channel_info => $channel)
		2705	if $self->can_msg;
		2706
		2707	$channel = $channel->{id};
		2708
		2709	} elsif (ref $channel) {
		2710	# send meta info to client, if not yet sent
		2711	unless (exists $self->{channel}{$channel->{id}}) {
		2712	$self->{channel}{$channel->{id}} = $channel;
		2713	$self->ext_msg (channel_info => $channel)
		2714	if $self->can_msg;
		2715	}
		2716
		2717	$channel = $channel->{id};
		2718	}
		2719
2438	return unless @extra \|\| length $msg;	2720	return unless @extra \|\| length $msg;
2439		2721
2440	if ($self->can_msg) {	2722	if ($self->can_msg) {
		2723	# default colour, mask it out
		2724	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2725	if $color & cf::NDI_DEF;
		2726
2441	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2727	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2728	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2442	} else {	2729	} else {
2443	# replace some tags by gcfclient-compatible ones
2444	for ($msg) {
2445	1 while
2446	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451	}
2452
2453	if ($color >= 0) {	2730	if ($color >= 0) {
		2731	# replace some tags by gcfclient-compatible ones
		2732	for ($msg) {
		2733	1 while
		2734	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2735	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2736	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2737	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2738	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2739	}
		2740
		2741	$color &= cf::NDI_COLOR_MASK;
		2742
		2743	utf8::encode $msg;
		2744
2454	if (0 && $msg =~ /\[/) {	2745	if (0 && $msg =~ /\[/) {
		2746	# COMMAND/INFO
2455	$self->send_packet ("drawextinfo $color 4 0 $msg")	2747	$self->send_packet ("drawextinfo $color 10 8 $msg")
2456	} else {	2748	} else {
2457	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2749	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2458	$self->send_packet ("drawinfo $color $msg")	2750	$self->send_packet ("drawinfo $color $msg")
2459	}	2751	}
2460	}	2752	}
2461	}	2753	}
2462	}	2754	}
2463		2755
2464	=item $client->ext_event ($type, %msg)	2756	=item $client->ext_msg ($type, @msg)
2465		2757
2466	Sends an ext event to the client.	2758	Sends an ext event to the client.
2467		2759
2468	=cut	2760	=cut
2469		2761
2470	sub cf::client::ext_event($$%) {	2762	sub cf::client::ext_msg($$@) {
2471	my ($self, $type, %msg) = @_;	2763	my ($self, $type, @msg) = @_;
2472		2764
2473	return unless $self->extcmd;	2765	if ($self->extcmd == 2) {
2474		2766	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2767	} elsif ($self->extcmd == 1) { # TODO: remove
2475	$msg{msgtype} = "event_$type";	2768	push @msg, msgtype => "event_$type";
2476	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2769	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2770	}
		2771	}
		2772
		2773	=item $client->ext_reply ($msgid, @msg)
		2774
		2775	Sends an ext reply to the client.
		2776
		2777	=cut
		2778
		2779	sub cf::client::ext_reply($$@) {
		2780	my ($self, $id, @msg) = @_;
		2781
		2782	if ($self->extcmd == 2) {
		2783	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2784	} elsif ($self->extcmd == 1) {
		2785	#TODO: version 1, remove
		2786	unshift @msg, msgtype => "reply", msgid => $id;
		2787	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2788	}
2477	}	2789	}
2478		2790
2479	=item $success = $client->query ($flags, "text", \&cb)	2791	=item $success = $client->query ($flags, "text", \&cb)
2480		2792
2481	Queues a query to the client, calling the given callback with	2793	Queues a query to the client, calling the given callback with
…		…
2536	my ($ns, $buf) = @_;	2848	my ($ns, $buf) = @_;
2537		2849
2538	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2850	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539		2851
2540	if (ref $msg) {	2852	if (ref $msg) {
		2853	my ($type, $reply, @payload) =
		2854	"ARRAY" eq ref $msg
		2855	? @$msg
		2856	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2857
		2858	my @reply;
		2859
2541	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2860	if (my $cb = $EXTICMD{$type}) {
2542	if (my %reply = $cb->($ns, $msg)) {	2861	@reply = $cb->($ns, @payload);
2543	$reply{msgid} = $msg->{msgid};
2544	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545	}
2546	}	2862	}
		2863
		2864	$ns->ext_reply ($reply, @reply)
		2865	if $reply;
		2866
2547	} else {	2867	} else {
2548	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2868	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549	}	2869	}
2550		2870
2551	cf::override;	2871	cf::override;
…		…
2598	our $safe = new Safe "safe";	2918	our $safe = new Safe "safe";
2599	our $safe_hole = new Safe::Hole;	2919	our $safe_hole = new Safe::Hole;
2600		2920
2601	$SIG{FPE} = 'IGNORE';	2921	$SIG{FPE} = 'IGNORE';
2602		2922
2603	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2923	$safe->permit_only (Opcode::opset qw(
		2924	:base_core :base_mem :base_orig :base_math
		2925	grepstart grepwhile mapstart mapwhile
		2926	sort time
		2927	));
2604		2928
2605	# here we export the classes and methods available to script code	2929	# here we export the classes and methods available to script code
2606		2930
2607	=pod	2931	=pod
2608		2932
2609	The following functions and methods are available within a safe environment:	2933	The following functions and methods are available within a safe environment:
2610		2934
2611	cf::object	2935	cf::object
2612	contr pay_amount pay_player map x y force_find force_add	2936	contr pay_amount pay_player map x y force_find force_add destroy
2613	insert remove	2937	insert remove name archname title slaying race decrease_ob_nr
2614		2938
2615	cf::object::player	2939	cf::object::player
2616	player	2940	player
2617		2941
2618	cf::player	2942	cf::player
…		…
2623		2947
2624	=cut	2948	=cut
2625		2949
2626	for (	2950	for (
2627	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2951	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2952	insert remove inv name archname title slaying race
2628	insert remove)],	2953	decrease_ob_nr destroy)],
2629	["cf::object::player" => qw(player)],	2954	["cf::object::player" => qw(player)],
2630	["cf::player" => qw(peaceful)],	2955	["cf::player" => qw(peaceful)],
2631	["cf::map" => qw(trigger)],	2956	["cf::map" => qw(trigger)],
2632	) {	2957	) {
2633	no strict 'refs';	2958	no strict 'refs';
…		…
2709	# the server's init and main functions	3034	# the server's init and main functions
2710		3035
2711	sub load_facedata($) {	3036	sub load_facedata($) {
2712	my ($path) = @_;	3037	my ($path) = @_;
2713		3038
		3039	# HACK to clear player env face cache, we need some signal framework
		3040	# for this (global event?)
		3041	%ext::player_env::MUSIC_FACE_CACHE = ();
		3042
		3043	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3044
2714	warn "loading facedata from $path\n";	3045	warn "loading facedata from $path\n";
2715		3046
2716	my $facedata;	3047	my $facedata;
2717	0 < aio_load $path, $facedata	3048	0 < aio_load $path, $facedata
2718	or die "$path: $!";	3049	or die "$path: $!";
2719		3050
2720	$facedata = Coro::Storable::thaw $facedata;	3051	$facedata = Coro::Storable::thaw $facedata;
2721		3052
2722	$facedata->{version} == 2	3053	$facedata->{version} == 2
2723	or cf::cleanup "$path: version mismatch, cannot proceed.";	3054	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3055
		3056	# patch in the exptable
		3057	$facedata->{resource}{"res/exp_table"} = {
		3058	type => FT_RSRC,
		3059	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3060	};
		3061	cf::cede_to_tick;
2724		3062
2725	{	3063	{
2726	my $faces = $facedata->{faceinfo};	3064	my $faces = $facedata->{faceinfo};
2727		3065
2728	while (my ($face, $info) = each %$faces) {	3066	while (my ($face, $info) = each %$faces) {
2729	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3067	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2730	cf::face::set_visibility $idx, $info->{visibility};	3068	cf::face::set_visibility $idx, $info->{visibility};
2731	cf::face::set_magicmap $idx, $info->{magicmap};	3069	cf::face::set_magicmap $idx, $info->{magicmap};
2732	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3070	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3071	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734		3072
2735	cf::cede_to_tick;	3073	cf::cede_to_tick;
2736	}	3074	}
2737		3075
2738	while (my ($face, $info) = each %$faces) {	3076	while (my ($face, $info) = each %$faces) {
…		…
2763		3101
2764	{	3102	{
2765	# TODO: for gcfclient pleasure, we should give resources	3103	# TODO: for gcfclient pleasure, we should give resources
2766	# that gcfclient doesn't grok a >10000 face index.	3104	# that gcfclient doesn't grok a >10000 face index.
2767	my $res = $facedata->{resource};	3105	my $res = $facedata->{resource};
2768	my $enc = JSON::XS->new->utf8->canonical;	3106
		3107	my $soundconf = delete $res->{"res/sound.conf"};
2769		3108
2770	while (my ($name, $info) = each %$res) {	3109	while (my ($name, $info) = each %$res) {
2771	my $meta = $enc->encode ({
2772	name => $name,
2773	type => $info->{type},
2774	copyright => $info->{copyright}, #TODO#
2775	});
2776
2777	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3110	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3111	my $data;
2778		3112
2779	if ($name =~ /\.jpg$/) {	3113	if ($info->{type} & 1) {
2780	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3114	# prepend meta info
2781	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3115
		3116	my $meta = $enc->encode ({
		3117	name => $name,
		3118	%{ $info->{meta} \|\| {} },
		3119	});
		3120
		3121	$data = pack "(w/a)", $meta, $info->{data};
2782	} else {	3122	} else {
2783	my $data = pack "(w/a)", $meta, $info->{data};	3123	$data = $info->{data};
2784	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786	cf::face::set_type $idx, 1;
2787	cf::face::set_data $idx, 0, $data, $chk;
2788	}	3124	}
2789		3125
		3126	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3127	cf::face::set_type $idx, $info->{type};
		3128
2790	cf::cede_to_tick;	3129	cf::cede_to_tick;
2791	}	3130	}
		3131
		3132	if ($soundconf) {
		3133	$soundconf = $enc->decode (delete $soundconf->{data});
		3134
		3135	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3136	my $sound = $soundconf->{compat}[$_]
		3137	or next;
		3138
		3139	my $face = cf::face::find "sound/$sound->[1]";
		3140	cf::sound::set $sound->[0] => $face;
		3141	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3142	}
		3143
		3144	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3145	my $face = cf::face::find "sound/$v";
		3146	cf::sound::set $k => $face;
		3147	}
		3148	}
2792	}	3149	}
2793		3150
2794	1	3151	1
2795	}	3152	}
2796		3153
		3154	register_exticmd fx_want => sub {
		3155	my ($ns, $want) = @_;
		3156
		3157	while (my ($k, $v) = each %$want) {
		3158	$ns->fx_want ($k, $v);
		3159	}
		3160	};
		3161
2797	sub reload_regions {	3162	sub reload_regions {
		3163	# HACK to clear player env face cache, we need some signal framework
		3164	# for this (global event?)
		3165	%ext::player_env::MUSIC_FACE_CACHE = ();
		3166
2798	load_resource_file "$MAPDIR/regions"	3167	load_resource_file "$MAPDIR/regions"
2799	or die "unable to load regions file\n";	3168	or die "unable to load regions file\n";
2800		3169
2801	for (cf::region::list) {	3170	for (cf::region::list) {
2802	$_->{match} = qr/$_->{match}/	3171	$_->{match} = qr/$_->{match}/
…		…
2838		3207
2839	sub init {	3208	sub init {
2840	reload_resources;	3209	reload_resources;
2841	}	3210	}
2842		3211
2843	sub cfg_load {	3212	sub reload_config {
2844	open my $fh, "<:utf8", "$CONFDIR/config"	3213	open my $fh, "<:utf8", "$CONFDIR/config"
2845	or return;	3214	or return;
2846		3215
2847	local $/;	3216	local $/;
2848	*CFG = YAML::Syck::Load <$fh>;	3217	*CFG = YAML::Syck::Load <$fh>;
…		…
2864	sub main {	3233	sub main {
2865	# we must not ever block the main coroutine	3234	# we must not ever block the main coroutine
2866	local $Coro::idle = sub {	3235	local $Coro::idle = sub {
2867	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3236	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2868	(async {	3237	(async {
		3238	$Coro::current->{desc} = "IDLE BUG HANDLER";
2869	Event::one_event;	3239	Event::one_event;
2870	})->prio (Coro::PRIO_MAX);	3240	})->prio (Coro::PRIO_MAX);
2871	};	3241	};
2872		3242
2873	cfg_load;	3243	reload_config;
2874	db_init;	3244	db_init;
2875	load_extensions;	3245	load_extensions;
2876		3246
2877	$TICK_WATCHER->start;	3247	$TICK_WATCHER->start;
2878	Event::loop;	3248	Event::loop;
…		…
2945	# and maps saved/destroyed asynchronously.	3315	# and maps saved/destroyed asynchronously.
2946	warn "begin emergency player save\n";	3316	warn "begin emergency player save\n";
2947	for my $login (keys %cf::PLAYER) {	3317	for my $login (keys %cf::PLAYER) {
2948	my $pl = $cf::PLAYER{$login} or next;	3318	my $pl = $cf::PLAYER{$login} or next;
2949	$pl->valid or next;	3319	$pl->valid or next;
		3320	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2950	$pl->save;	3321	$pl->save;
2951	}	3322	}
2952	warn "end emergency player save\n";	3323	warn "end emergency player save\n";
2953		3324
2954	warn "begin emergency map save\n";	3325	warn "begin emergency map save\n";
…		…
3002		3373
3003	warn "flushing outstanding aio requests";	3374	warn "flushing outstanding aio requests";
3004	for (;;) {	3375	for (;;) {
3005	BDB::flush;	3376	BDB::flush;
3006	IO::AIO::flush;	3377	IO::AIO::flush;
3007	Coro::cede;	3378	Coro::cede_notself;
3008	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3379	last unless IO::AIO::nreqs \|\| BDB::nreqs;
3009	warn "iterate...";	3380	warn "iterate...";
3010	}	3381	}
3011		3382
3012	++$RELOAD;	3383	++$RELOAD;
…		…
3071	warn "reloading cf.pm";	3442	warn "reloading cf.pm";
3072	require cf;	3443	require cf;
3073	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3444	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074		3445
3075	warn "loading config and database again";	3446	warn "loading config and database again";
3076	cf::cfg_load;	3447	cf::reload_config;
3077		3448
3078	warn "loading extensions";	3449	warn "loading extensions";
3079	cf::load_extensions;	3450	cf::load_extensions;
3080		3451
3081	warn "reattaching attachments to objects/players";	3452	warn "reattaching attachments to objects/players";
…		…
3117	register_command "reload" => sub {	3488	register_command "reload" => sub {
3118	my ($who, $arg) = @_;	3489	my ($who, $arg) = @_;
3119		3490
3120	if ($who->flag (FLAG_WIZ)) {	3491	if ($who->flag (FLAG_WIZ)) {
3121	$who->message ("reloading server.");	3492	$who->message ("reloading server.");
		3493	async {
		3494	$Coro::current->{desc} = "perl_reload";
3122	async { reload_perl };	3495	reload_perl;
		3496	};
3123	}	3497	}
3124	};	3498	};
3125		3499
3126	unshift @INC, $LIBDIR;	3500	unshift @INC, $LIBDIR;
3127		3501
…		…
3146	my $signal = new Coro::Signal;	3520	my $signal = new Coro::Signal;
3147	push @WAIT_FOR_TICK_BEGIN, $signal;	3521	push @WAIT_FOR_TICK_BEGIN, $signal;
3148	$signal->wait;	3522	$signal->wait;
3149	}	3523	}
3150		3524
3151	my $min = 1e6;#d#
3152	my $avg = 10;
3153	$TICK_WATCHER = Event->timer (	3525	$TICK_WATCHER = Event->timer (
3154	reentrant => 0,	3526	reentrant => 0,
3155	parked => 1,	3527	parked => 1,
3156	prio => 0,	3528	prio => 0,
3157	at => $NEXT_TICK \|\| $TICK,	3529	at => $NEXT_TICK \|\| $TICK,
…		…
3165		3537
3166	$NOW = $tick_start = Event::time;	3538	$NOW = $tick_start = Event::time;
3167		3539
3168	cf::server_tick; # one server iteration	3540	cf::server_tick; # one server iteration
3169		3541
3170	0 && sync_job {#d#
3171	for(1..10) {
3172	my $t = Event::time;
3173	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3174	or die;
3175
3176	$map->width (50);
3177	$map->height (50);
3178	$map->alloc;
3179	$map->_load_objects ("/tmp/x.map", 1);
3180	my $t = Event::time - $t;
3181
3182	#next unless $t < 0.0013;#d#
3183	if ($t < $min) {
3184	$min = $t;
3185	}
3186	$avg = $avg * 0.99 + $t * 0.01;
3187	}
3188	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189	exit 0;
3190	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191	};
3192
3193	$RUNTIME += $TICK;	3542	$RUNTIME += $TICK;
3194	$NEXT_TICK += $TICK;	3543	$NEXT_TICK += $TICK;
3195		3544
3196	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3545	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197	$NEXT_RUNTIME_WRITE = $NOW + 10;	3546	$NEXT_RUNTIME_WRITE = $NOW + 10;
3198	Coro::async_pool {	3547	Coro::async_pool {
		3548	$Coro::current->{desc} = "runtime saver";
3199	write_runtime	3549	write_runtime
3200	or warn "ERROR: unable to write runtime file: $!";	3550	or warn "ERROR: unable to write runtime file: $!";
3201	};	3551	};
3202	}	3552	}
3203		3553
3204	# my $AFTER = Event::time;
3205	# warn $AFTER - $NOW;#d#
3206
3207	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3554	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208	$sig->send;	3555	$sig->send;
3209	}	3556	}
3210	while (my $sig = shift @WAIT_FOR_TICK) {	3557	while (my $sig = shift @WAIT_FOR_TICK) {
3211	$sig->send;	3558	$sig->send;
…		…
3221		3568
3222	$LOAD = ($NOW - $tick_start) / $TICK;	3569	$LOAD = ($NOW - $tick_start) / $TICK;
3223	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3570	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224		3571
3225	_post_tick;	3572	_post_tick;
3226
3227
3228	},	3573	},
3229	);	3574	);
3230		3575
3231	{	3576	{
		3577	BDB::min_parallel 8;
3232	BDB::max_poll_time $TICK * 0.1;	3578	BDB::max_poll_time $TICK * 0.1;
3233	$BDB_POLL_WATCHER = Event->io (	3579	$BDB_POLL_WATCHER = Event->io (
3234	reentrant => 0,	3580	reentrant => 0,
3235	fd => BDB::poll_fileno,	3581	fd => BDB::poll_fileno,
3236	poll => 'r',	3582	poll => 'r',
3237	prio => 0,	3583	prio => 0,
3238	data => WF_AUTOCANCEL,	3584	data => WF_AUTOCANCEL,
3239	cb => \&BDB::poll_cb,	3585	cb => \&BDB::poll_cb,
3240	);	3586	);
3241	BDB::min_parallel 8;
3242		3587
3243	BDB::set_sync_prepare {	3588	BDB::set_sync_prepare {
3244	my $status;	3589	my $status;
3245	my $current = $Coro::current;	3590	my $current = $Coro::current;
3246	(	3591	(
…		…
3255	)	3600	)
3256	};	3601	};
3257		3602
3258	unless ($DB_ENV) {	3603	unless ($DB_ENV) {
3259	$DB_ENV = BDB::db_env_create;	3604	$DB_ENV = BDB::db_env_create;
		3605	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3606	\| BDB::LOG_AUTOREMOVE, 1);
		3607	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3608	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3260		3609
3261	cf::sync_job {	3610	cf::sync_job {
3262	eval {	3611	eval {
3263	BDB::db_env_open	3612	BDB::db_env_open
3264	$DB_ENV,	3613	$DB_ENV,
…		…
3266	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3615	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3267	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3616	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3268	0666;	3617	0666;
3269		3618
3270	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3619	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3273	$DB_ENV->set_lk_detect;
3274	};	3620	};
3275		3621
3276	cf::cleanup "db_env_open(db): $@" if $@;	3622	cf::cleanup "db_env_open(db): $@" if $@;
3277	};	3623	};
3278	}	3624	}
		3625
		3626	$BDB_DEADLOCK_WATCHER = Event->timer (
		3627	after => 3,
		3628	interval => 1,
		3629	hard => 1,
		3630	prio => 0,
		3631	data => WF_AUTOCANCEL,
		3632	cb => sub {
		3633	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3634	},
		3635	);
		3636	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3637	after => 11,
		3638	interval => 60,
		3639	hard => 1,
		3640	prio => 0,
		3641	data => WF_AUTOCANCEL,
		3642	cb => sub {
		3643	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3644	},
		3645	);
		3646	$BDB_TRICKLE_WATCHER = Event->timer (
		3647	after => 5,
		3648	interval => 10,
		3649	hard => 1,
		3650	prio => 0,
		3651	data => WF_AUTOCANCEL,
		3652	cb => sub {
		3653	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3654	},
		3655	);
3279	}	3656	}
3280		3657
3281	{	3658	{
3282	IO::AIO::min_parallel 8;	3659	IO::AIO::min_parallel 8;
3283		3660
…		…
3286	$AIO_POLL_WATCHER = Event->io (	3663	$AIO_POLL_WATCHER = Event->io (
3287	reentrant => 0,	3664	reentrant => 0,
3288	data => WF_AUTOCANCEL,	3665	data => WF_AUTOCANCEL,
3289	fd => IO::AIO::poll_fileno,	3666	fd => IO::AIO::poll_fileno,
3290	poll => 'r',	3667	poll => 'r',
3291	prio => 6,	3668	prio => 0,
3292	cb => \&IO::AIO::poll_cb,	3669	cb => \&IO::AIO::poll_cb,
3293	);	3670	);
3294	}	3671	}
3295		3672
3296	my $_log_backtrace;	3673	my $_log_backtrace;
…		…
3302		3679
3303	# limit the # of concurrent backtraces	3680	# limit the # of concurrent backtraces
3304	if ($_log_backtrace < 2) {	3681	if ($_log_backtrace < 2) {
3305	++$_log_backtrace;	3682	++$_log_backtrace;
3306	async {	3683	async {
		3684	$Coro::current->{desc} = "abt $msg";
		3685
3307	my @bt = fork_call {	3686	my @bt = fork_call {
3308	@addr = map { sprintf "%x", $_ } @addr;	3687	@addr = map { sprintf "%x", $_ } @addr;
3309	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3688	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3689	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3311	or die "addr2line: $!";	3690	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.309 by elmex, Mon Jul 16 15:27:06 2007 UTC vs. Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.309 by elmex, Mon Jul 16 15:27:06 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC