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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.302 by root, Tue Jul 10 16:23:59 2007 UTC vs.
Revision 1.363 by root, Mon Sep 10 17:24:36 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 3.64 ();
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 ();
…		…
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_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	87	our $DB_ENV;
85		88
86	our %CFG;	89	our %CFG;
87		90
88	our $UPTIME; $UPTIME \|\|= time;	91	our $UPTIME; $UPTIME \|\|= time;
89	our $RUNTIME;	92	our $RUNTIME;
90		93
91	our %PLAYER; # all users	94	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	95	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	96	our $LINK_MAP; # the special {link} map, which is always available
94		97
95	# used to convert map paths into valid unix filenames by replacing / by ∕	98	# used to convert map paths into valid unix filenames by replacing / by ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		100
…		…
167		170
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	171	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169	returns directly I<after> the tick processing (and consequently, can only wake one process	172	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.	173	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171		174
		175	=item @cf::INVOKE_RESULTS
		176
		177	This array contains the results of the last C<invoke ()> call. When
		178	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		179	that call.
		180
172	=back	181	=back
173		182
174	=cut	183	=cut
175		184
176	BEGIN {	185	BEGIN {
…		…
180	$msg .= "\n"	189	$msg .= "\n"
181	unless $msg =~ /\n$/;	190	unless $msg =~ /\n$/;
182		191
183	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184		193
185	utf8::encode $msg;
186	LOG llevError, $msg;	194	LOG llevError, $msg;
187	};	195	};
188	}	196	}
189		197
190	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
265	Wait until the given lock is available and then acquires it and returns	273	Wait until the given lock is available and then acquires it and returns
266	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	274	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267	for example when the coroutine gets canceled), the lock is automatically	275	for example when the coroutine gets canceled), the lock is automatically
268	returned.	276	returned.
269		277
		278	Locks are not recursive, locking from the same coro twice results in a
		279	deadlocked coro.
		280
270	Lock names should begin with a unique identifier (for example, cf::map::find	281	Lock names should begin with a unique identifier (for example, cf::map::find
271	uses map_find and cf::map::load uses map_load).	282	uses map_find and cf::map::load uses map_load).
272		283
273	=item $locked = cf::lock_active $string	284	=item $locked = cf::lock_active $string
274		285
275	Return true if the lock is currently active, i.e. somebody has locked it.	286	Return true if the lock is currently active, i.e. somebody has locked it.
276		287
277	=cut	288	=cut
278		289
279	our %LOCK;	290	our %LOCK;
		291	our %LOCKER;#d#
280		292
281	sub lock_wait($) {	293	sub lock_wait($) {
282	my ($key) = @_;	294	my ($key) = @_;
		295
		296	if ($LOCKER{$key} == $Coro::current) {#d#
		297	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		298	return;#d#
		299	}#d#
283		300
284	# wait for lock, if any	301	# wait for lock, if any
285	while ($LOCK{$key}) {	302	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	303	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	304	Coro::schedule;
…		…
293		310
294	# wait, to be sure we are not locked	311	# wait, to be sure we are not locked
295	lock_wait $key;	312	lock_wait $key;
296		313
297	$LOCK{$key} = [];	314	$LOCK{$key} = [];
		315	$LOCKER{$key} = $Coro::current;#d#
298		316
299	Coro::guard {	317	Coro::guard {
		318	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	319	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	320	$_->ready for @{ delete $LOCK{$key} };
302	}	321	}
303	}	322	}
304		323
…		…
314	my $guard = Coro::guard {	333	my $guard = Coro::guard {
315	$TICK_WATCHER->start;	334	$TICK_WATCHER->start;
316	};	335	};
317	$TICK_WATCHER->stop;	336	$TICK_WATCHER->stop;
318	$guard	337	$guard
		338	}
		339
		340	=item cf::get_slot $time[, $priority[, $name]]
		341
		342	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		343	This call blocks and returns only when you have at least C<$time> seconds
		344	of cpu time till the next tick. The slot is only valid till the next cede.
		345
		346	The optional C<$name> can be used to identify the job to run. It might be
		347	used for statistical purposes and should identify the same time-class.
		348
		349	Useful for short background jobs.
		350
		351	=cut
		352
		353	our @SLOT_QUEUE;
		354	our $SLOT_QUEUE;
		355
		356	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		357	$SLOT_QUEUE = Coro::async {
		358	my $signal = new Coro::Signal;
		359
		360	while () {
		361	next_job:
		362	my $avail = cf::till_tick;
		363	if ($avail > 0.01) {
		364	for (0 .. $#SLOT_QUEUE) {
		365	if ($SLOT_QUEUE[$_][0] < $avail) {
		366	my $job = splice @SLOT_QUEUE, $_, 1, ();
		367	$job->[2]->send;
		368	Coro::cede;
		369	goto next_job;
		370	}
		371	}
		372	}
		373
		374	if (@SLOT_QUEUE) {
		375	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		376	push @cf::WAIT_FOR_TICK, $signal;
		377	$signal->wait;
		378	} else {
		379	Coro::schedule;
		380	}
		381	}
		382	};
		383
		384	sub get_slot($;$$) {
		385	my ($time, $pri, $name) = @_;
		386
		387	$time = $TICK * .6 if $time > $TICK * .6;
		388	my $sig = new Coro::Signal;
		389
		390	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		391	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		392	$SLOT_QUEUE->ready;
		393	$sig->wait;
319	}	394	}
320		395
321	=item cf::async { BLOCK }	396	=item cf::async { BLOCK }
322		397
323	Currently the same as Coro::async_pool, meaning you cannot use	398	Currently the same as Coro::async_pool, meaning you cannot use
…		…
410	Coro::Storable. May, of course, block. Note that the executed sub may	485	Coro::Storable. May, of course, block. Note that the executed sub may
411	never block itself or use any form of Event handling.	486	never block itself or use any form of Event handling.
412		487
413	=cut	488	=cut
414		489
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(&@) {	490	sub fork_call(&@) {
425	my ($cb, @args) = @_;	491	my ($cb, @args) = @_;
426		492
427	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	493	# we seemingly have to make a local copy of the whole thing,
428	# or die "socketpair: $!";	494	# otherwise perl prematurely frees the stuff :/
429	pipe my $fh1, my $fh2	495	# TODO: investigate and fix (likely this will be rather laborious)
430	or die "pipe: $!";
431		496
432	if (my $pid = fork) {	497	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;	498	reset_signals;
446	local $SIG{__WARN__};	499	&$cb
447	local $SIG{__DIE__};	500	}, @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		501
454	eval {	502	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	}	503	}
467		504
468	=item $value = cf::db_get $family => $key	505	=item $value = cf::db_get $family => $key
469		506
470	Returns a single value from the environment database.	507	Returns a single value from the environment database.
…		…
472	=item cf::db_put $family => $key => $value	509	=item cf::db_put $family => $key => $value
473		510
474	Stores the given C<$value> in the family. It can currently store binary	511	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).	512	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476		513
		514	=item $db = cf::db_table "name"
		515
		516	Create and/or open a new database table. The string must not be "db" and must be unique
		517	within each server.
		518
477	=cut	519	=cut
		520
		521	sub db_table($) {
		522	my ($name) = @_;
		523	my $db = BDB::db_create $DB_ENV;
		524
		525	eval {
		526	$db->set_flags (BDB::CHKSUM);
		527
		528	utf8::encode $name;
		529	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		530	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		531	cf::cleanup "db_open(db): $!" if $!;
		532	};
		533	cf::cleanup "db_open(db): $@" if $@;
		534
		535	$db
		536	}
478		537
479	our $DB;	538	our $DB;
480		539
481	sub db_init {	540	sub db_init {
482	unless ($DB) {
483	$DB = BDB::db_create $DB_ENV;
484
485	cf::sync_job {	541	cf::sync_job {
486	eval {	542	$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	}	543	};
496	}	544	}
497		545
498	sub db_get($$) {	546	sub db_get($$) {
499	my $key = "$_[0]/$_[1]";	547	my $key = "$_[0]/$_[1]";
500		548
…		…
550	if (1) {	598	if (1) {
551	$md5 =	599	$md5 =
552	join "\x00",	600	join "\x00",
553	$processversion,	601	$processversion,
554	map {	602	map {
555	Coro::cede;	603	cf::cede_to_tick;
556	($src->[$_], Digest::MD5::md5_hex $data[$_])	604	($src->[$_], Digest::MD5::md5_hex $data[$_])
557	} 0.. $#$src;	605	} 0.. $#$src;
558		606
559		607
560	my $dbmd5 = db_get cache => "$id/md5";	608	my $dbmd5 = db_get cache => "$id/md5";
…		…
866	";	914	";
867	die if $@;	915	die if $@;
868	}	916	}
869		917
870	our $override;	918	our $override;
871	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	919	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872		920
873	sub override {	921	sub override {
874	$override = 1;	922	$override = 1;
875	@invoke_results = ();	923	@INVOKE_RESULTS = (@_);
876	}	924	}
877		925
878	sub do_invoke {	926	sub do_invoke {
879	my $event = shift;	927	my $event = shift;
880	my $callbacks = shift;	928	my $callbacks = shift;
881		929
882	@invoke_results = ();	930	@INVOKE_RESULTS = ();
883		931
884	local $override;	932	local $override;
885		933
886	for (@$callbacks) {	934	for (@$callbacks) {
887	eval { &{$_->[1]} };	935	eval { &{$_->[1]} };
…		…
904		952
905	Generate an object-specific event with the given arguments.	953	Generate an object-specific event with the given arguments.
906		954
907	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	955	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	956	removed in future versions), and there is no public API to access override
909	results (if you must, access C<@cf::invoke_results> directly).	957	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910		958
911	=back	959	=back
912		960
913	=cut	961	=cut
914		962
915	#############################################################################	963	#############################################################################
916	# object support	964	# object support
		965	#
		966
		967	sub _can_merge {
		968	my ($ob1, $ob2) = @_;
		969
		970	local $Storable::canonical = 1;
		971	my $fob1 = Storable::freeze $ob1;
		972	my $fob2 = Storable::freeze $ob2;
		973
		974	$fob1 eq $fob2
		975	}
917		976
918	sub reattach {	977	sub reattach {
919	# basically do the same as instantiate, without calling instantiate	978	# basically do the same as instantiate, without calling instantiate
920	my ($obj) = @_;	979	my ($obj) = @_;
921		980
…		…
966	);	1025	);
967		1026
968	sub object_freezer_save {	1027	sub object_freezer_save {
969	my ($filename, $rdata, $objs) = @_;	1028	my ($filename, $rdata, $objs) = @_;
970		1029
		1030	my $guard = cf::lock_acquire "io";
		1031
971	sync_job {	1032	sync_job {
972	if (length $$rdata) {	1033	if (length $$rdata) {
		1034	utf8::decode (my $decname = $filename);
973	warn sprintf "saving %s (%d,%d)\n",	1035	warn sprintf "saving %s (%d,%d)\n",
974	$filename, length $$rdata, scalar @$objs;	1036	$decname, length $$rdata, scalar @$objs;
975		1037
976	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1038	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
977	chmod SAVE_MODE, $fh;	1039	chmod SAVE_MODE, $fh;
978	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979	aio_fsync $fh if $cf::USE_FSYNC;	1041	aio_fsync $fh if $cf::USE_FSYNC;
…		…
998	}	1060	}
999	} else {	1061	} else {
1000	aio_unlink $filename;	1062	aio_unlink $filename;
1001	aio_unlink "$filename.pst";	1063	aio_unlink "$filename.pst";
1002	}	1064	}
1003	}	1065	};
		1066
		1067	undef $guard;
1004	}	1068	}
1005		1069
1006	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
1007	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
1008		1072
…		…
1013		1077
1014	sub object_thawer_load {	1078	sub object_thawer_load {
1015	my ($filename) = @_;	1079	my ($filename) = @_;
1016		1080
1017	my ($data, $av);	1081	my ($data, $av);
		1082
		1083	my $guard = cf::lock_acquire "io";
1018		1084
1019	(aio_load $filename, $data) >= 0	1085	(aio_load $filename, $data) >= 0
1020	or return;	1086	or return;
1021		1087
1022	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1023	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1024	or return;	1090	or return;
		1091
		1092	undef $guard;
1025	$av = eval { (Storable::thaw $av)->{objs} };	1093	$av = eval { (Storable::thaw $av)->{objs} };
1026	}	1094	}
1027		1095
		1096	utf8::decode (my $decname = $filename);
1028	warn sprintf "loading %s (%d)\n",	1097	warn sprintf "loading %s (%d,%d)\n",
1029	$filename, length $data, scalar @{$av \|\| []};	1098	$decname, length $data, scalar @{$av \|\| []};
		1099
1030	return ($data, $av);	1100	($data, $av)
1031	}	1101	}
1032		1102
1033	=head2 COMMAND CALLBACKS	1103	=head2 COMMAND CALLBACKS
1034		1104
1035	=over 4	1105	=over 4
…		…
1108	my ($pl, $buf) = @_;	1178	my ($pl, $buf) = @_;
1109		1179
1110	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1180	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111		1181
1112	if (ref $msg) {	1182	if (ref $msg) {
		1183	my ($type, $reply, @payload) =
		1184	"ARRAY" eq ref $msg
		1185	? @$msg
		1186	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1187
		1188	my @reply;
		1189
1113	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1190	if (my $cb = $EXTCMD{$type}) {
1114	if (my %reply = $cb->($pl, $msg)) {	1191	@reply = $cb->($pl, @payload);
1115	$pl->ext_reply ($msg->{msgid}, %reply);
1116	}
1117	}	1192	}
		1193
		1194	$pl->ext_reply ($reply, @reply)
		1195	if $reply;
		1196
1118	} else {	1197	} else {
1119	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120	}	1199	}
1121		1200
1122	cf::override;	1201	cf::override;
…		…
1212		1291
1213	=head3 cf::player	1292	=head3 cf::player
1214		1293
1215	=over 4	1294	=over 4
1216		1295
		1296	=item cf::player::num_playing
		1297
		1298	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1299
		1300	=cut
		1301
		1302	sub num_playing {
		1303	scalar grep
		1304	$_->ob->map
		1305	&& !$_->hidden
		1306	&& !$_->ob->flag (cf::FLAG_WIZ),
		1307	cf::player::list
		1308	}
		1309
1217	=item cf::player::find $login	1310	=item cf::player::find $login
1218		1311
1219	Returns the given player object, loading it if necessary (might block).	1312	Returns the given player object, loading it if necessary (might block).
1220		1313
1221	=cut	1314	=cut
…		…
1256	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1349	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1350	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1351	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259	aio_unlink +(playerdir $login) . "/$login.pl";	1352	aio_unlink +(playerdir $login) . "/$login.pl";
1260		1353
1261	my $pl = load_pl path $login	1354	my $f = new_from_file cf::object::thawer path $login
1262	or return;	1355	or return;
		1356
		1357	$f->next;
		1358	my $pl = cf::player::load_pl $f
		1359	or return;
		1360	local $cf::PLAYER_LOADING{$login} = $pl;
		1361	$f->resolve_delayed_derefs;
1263	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1264	}	1363	}
1265	}	1364	}
1266	}	1365	}
1267		1366
…		…
1277		1376
1278	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1279	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1280		1379
1281	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1282	Coro::cede;	1381	cf::cede_to_tick;
1283	}	1382	}
1284		1383
1285	sub new($) {	1384	sub new($) {
1286	my ($login) = @_;	1385	my ($login) = @_;
1287		1386
…		…
1291	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1292		1391
1293	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1294		1393
1295	$self	1394	$self
		1395	}
		1396
		1397	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1398
		1399	=cut
		1400
		1401	sub send_msg {
		1402	my $ns = shift->ns
		1403	or return;
		1404	$ns->send_msg (@_);
1296	}	1405	}
1297		1406
1298	=item $pl->quit_character	1407	=item $pl->quit_character
1299		1408
1300	Nukes the player without looking back. If logged in, the connection will	1409	Nukes the player without looking back. If logged in, the connection will
…		…
1355	or return [];	1464	or return [];
1356		1465
1357	my @logins;	1466	my @logins;
1358		1467
1359	for my $login (@$dirs) {	1468	for my $login (@$dirs) {
		1469	my $path = path $login;
		1470
		1471	# a .pst is a dead give-away for a valid player
		1472	unless (-e "$path.pst") {
1360	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1362	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1363		1477
1364	utf8::decode $login;	1478	utf8::decode $login;
1365	push @logins, $login;	1479	push @logins, $login;
1366	}	1480	}
1367		1481
…		…
1405	sub expand_cfpod {	1519	sub expand_cfpod {
1406	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1407		1521
1408	# escape & and <	1522	# escape & and <
1409	s/&/&/g;	1523	s/&/&/g;
1410	s/(?<![BIUGH])</</g;	1524	s/(?<![BIUGHT])</</g;
1411		1525
1412	# this is buggy, it needs to properly take care of nested <'s	1526	# this is buggy, it needs to properly take care of nested <'s
1413		1527
1414	1 while	1528	1 while
1415	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1416	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1417	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1531	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1418	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1532	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1419	# replace G<male\|female> tags	1534	# replace G<male\|female> tags
1420	\|\| s{G<([^>\|])\\|([^>])>}{	1535	\|\| s{G<([^>\|])\\|([^>])>}{
1421	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1422	}ge	1537	}ge
1423	# replace H<hint text>	1538	# replace H<hint text>
…		…
1444	sub hintmode {	1559	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1561	$_[0]{hintmode}
1447	}	1562	}
1448		1563
1449	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1450		1565
1451	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1452		1567
1453	=cut	1568	=cut
1454		1569
1455	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1457		1572
1458	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460	}	1574	}
1461		1575
1462	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1463		1577
1464	Sends an ext event to the client.	1578	Sends an ext event to the client.
1465		1579
1466	=cut	1580	=cut
1467		1581
1468	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1470		1584
1471	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1472	}	1586	}
1473		1587
1474	=head3 cf::region	1588	=head3 cf::region
1475		1589
1476	=over 4	1590	=over 4
…		…
1489	my ($path) = @_;	1603	my ($path) = @_;
1490		1604
1491	my ($match, $specificity);	1605	my ($match, $specificity);
1492		1606
1493	for my $region (list) {	1607	for my $region (list) {
1494	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1495	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1496	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1497	}	1611	}
1498	}	1612	}
1499		1613
…		…
1619	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1620	return $self;	1734	return $self;
1621	}	1735	}
1622	}	1736	}
1623		1737
1624	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1625	()	1739	()
1626	}	1740	}
1627		1741
1628	sub init {	1742	sub init {
1629	my ($self) = @_;	1743	my ($self) = @_;
…		…
1692		1806
1693	sub load_header_from($) {	1807	sub load_header_from($) {
1694	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1695		1809
1696	utf8::encode $path;	1810	utf8::encode $path;
1697	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1698	# or return;
1699
1700	$self->_load_header ($path)
1701	or return;	1812	or return;
		1813
		1814	$self->_load_header ($f)
		1815	or return;
		1816
		1817	local $MAP_LOADING{$self->{path}} = $self;
		1818	$f->resolve_delayed_derefs;
1702		1819
1703	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1704		1821
1705	1	1822	1
1706	}	1823	}
…		…
1760	sub find {	1877	sub find {
1761	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1762		1879
1763	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1764		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1765	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1766		1884
1767	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1768	my $guard = cf::lock_acquire "map_find:$path";	1886	my $guard1 = cf::lock_acquire "map_find:$path";
		1887	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1888
1769	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1770	or return;	1890	or return;
1771		1891
1772	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1773		1893
…		…
1775	or return;	1895	or return;
1776		1896
1777	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1779	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1780	$map->reset;	1902	$map->reset;
1781	undef $guard;
1782	return find $path;	1903	return find $path;
1783	}	1904	}
1784		1905
1785	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1786	}	1907	}
…		…
1795	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1796		1917
1797	my $path = $self->{path};	1918	my $path = $self->{path};
1798		1919
1799	{	1920	{
1800	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1801		1922
		1923	return unless $self->valid;
1802	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1803		1925
1804	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1805		1927
1806	$self->alloc;	1928	$self->alloc;
1807		1929
1808	$self->pre_load;	1930	$self->pre_load;
1809	Coro::cede;	1931	cf::cede_to_tick;
1810		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1811	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1812	or return;	1936	or return;
1813		1937
1814	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815	if delete $self->{load_original};	1939	if delete $self->{load_original};
1816		1940
1817	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1818	utf8::encode $uniq;	1942	utf8::encode $uniq;
1819	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1820	$self->clear_unique_items;	1945	$self->clear_unique_items;
1821	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1822	}	1949	}
1823	}	1950	}
1824		1951
1825	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1826	# now do the right thing for maps	1955	# now do the right thing for maps
1827	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1828	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1829	unless $self->difficulty;	1958	unless $self->difficulty;
1830	Coro::cede;	1959	cf::cede_to_tick;
1831		1960
1832	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1833	$self->decay_objects;	1962	$self->decay_objects;
1834	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1835	$self->update_buttons;	1964	$self->update_buttons;
1836	Coro::cede;	1965	cf::cede_to_tick;
1837	$self->set_darkness_map;	1966	$self->set_darkness_map;
1838	Coro::cede;	1967	cf::cede_to_tick;
1839	$self->activate;	1968	$self->activate;
1840	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1841		1973
1842	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	1975	}
1844		1976
1845	$self->post_load;	1977	$self->post_load;
…		…
1856		1988
1857	$self	1989	$self
1858	}	1990	}
1859		1991
1860	# find and load all maps in the 3x3 area around a map	1992	# find and load all maps in the 3x3 area around a map
1861	sub load_diag {	1993	sub load_neighbours {
1862	my ($map) = @_;	1994	my ($map) = @_;
1863		1995
1864	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1865		1997
1866	for (0 .. 3) {	1998	for (0 .. 3) {
1867	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1868	or next;	2000	or next;
1869	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1870	or next;	2002	or next;
1871	$neigh->load;	2003	$neigh->load;
1872		2004
		2005	push @neigh,
1873	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1874	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1875	}	2008	}
1876		2009
1877	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1878	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1879	or next;	2013	or next;
1880	$neigh->load;	2014	$neigh->load;
1881	}	2015	}
1882	}	2016	}
1883		2017
…		…
1888	}	2022	}
1889		2023
1890	sub do_load_sync {	2024	sub do_load_sync {
1891	my ($map) = @_;	2025	my ($map) = @_;
1892		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1893	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1894	}	2031	}
1895		2032
1896	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1897	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1898		2035
1899	sub find_async {	2036	sub find_async {
1900	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1901		2038
1902	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1903		2040
1904	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1905	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1906	}	2043	}
1907		2044
1908	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1909	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
1910	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1912	my $map = find $path	2050	if (my $map = find $k) {
1913	or next;
1914	$map->load;	2051	$map->load if $v;
		2052	}
1915		2053
1916	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1917	}	2055	}
1918	}	2056	}
1919	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1920	};	2058	};
1921	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1924	}	2062	}
1925		2063
1926	sub save {	2064	sub save {
1927	my ($self) = @_;	2065	my ($self) = @_;
1928		2066
1929	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1930		2068
1931	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1932		2070
1933	return unless $self->dirty;	2071	return unless $self->dirty;
1934		2072
…		…
1957	my ($self) = @_;	2095	my ($self) = @_;
1958		2096
1959	# save first because save cedes	2097	# save first because save cedes
1960	$self->save;	2098	$self->save;
1961		2099
1962	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1963		2101
1964	return if $self->players;	2102	return if $self->players;
1965	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1966	return if $self->{deny_save};	2104	return if $self->{deny_save};
1967		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1968	$self->clear;	2110	$self->clear;
1969	$self->in_memory (cf::MAP_SWAPPED);
1970	}	2111	}
1971		2112
1972	sub reset_at {	2113	sub reset_at {
1973	my ($self) = @_;	2114	my ($self) = @_;
1974		2115
…		…
2006	if $uniq;	2147	if $uniq;
2007	}	2148	}
2008		2149
2009	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
2010		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
2011	$self->clear;	2154	$self->clear;
2012
2013	$_->clear_links_to ($self) for values %cf::MAP;
2014		2155
2015	$self->unlink_save;	2156	$self->unlink_save;
2016	$self->destroy;	2157	$self->destroy;
2017	}	2158	}
2018		2159
2019	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
2020		2161
2021	sub nuke {	2162	sub nuke {
2022	my ($self) = @_;	2163	my ($self) = @_;
2023		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
2024	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
2025		2169
2026	$self->unlink_save;	2170	$self->unlink_save;
2027		2171
2028	bless $self, "cf::map";	2172	bless $self, "cf::map";
2029	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
2030	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
2031	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
2032	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033		2177
2034	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
2035		2180
2036	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
2037	}	2182	}
2038		2183
2039	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2115		2260
2116	sub inv_recursive {	2261	sub inv_recursive {
2117	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2118	}	2263	}
2119		2264
		2265	=item $ref = $ob->ref
		2266
		2267	creates and returns a persistent reference to an objetc that can be stored as a string.
		2268
		2269	=item $ob = cf::object::deref ($refstring)
		2270
		2271	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2272	even if the object actually exists. May block.
		2273
		2274	=cut
		2275
		2276	sub deref {
		2277	my ($ref) = @_;
		2278
		2279	# temporary compatibility#TODO#remove
		2280	$ref =~ s{^<}{player/<};
		2281
		2282	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2283	my ($uuid, $name) = ($1, $2);
		2284	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2285	or return;
		2286	$pl->ob->uuid eq $uuid
		2287	or return;
		2288
		2289	$pl->ob
		2290	} else {
		2291	warn "$ref: cannot resolve object reference\n";
		2292	undef
		2293	}
		2294	}
		2295
2120	package cf;	2296	package cf;
2121		2297
2122	=back	2298	=back
2123		2299
2124	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2146		2322
2147	} else {	2323	} else {
2148	my $pl = $self->contr;	2324	my $pl = $self->contr;
2149		2325
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2328	$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		2329
2159	} else {	2330	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2162	}	2333	}
2163	}	2334	}
		2335	}
		2336
		2337	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2338
		2339	=cut
		2340
		2341	sub cf::object::send_msg {
		2342	my $pl = shift->contr
		2343	or return;
		2344	$pl->send_msg (@_);
2164	}	2345	}
2165		2346
2166	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2167		2348
2168	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2247	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2248	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2249	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2250		2431
2251	$map->load;	2432	$map->load;
2252	$map->load_diag;	2433	$map->load_neighbours;
2253		2434
2254	return unless $self->contr->active;	2435	return unless $self->contr->active;
2255	$self->activate_recursive;	2436	$self->activate_recursive;
2256		2437
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2259	}	2440	}
2260		2441
2261	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262		2443
2263	Moves the player to the given map-path and coordinates by first freezing	2444	Moves the player to the given map-path and coordinates by first freezing
2264	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2265	that has to return the map if sucecssful, and then unfreezes the player on	2446	that has to return the map if sucecssful, and then unfreezes the player on
2266	the new (success) or old (failed) map position.	2447	the new (success) or old (failed) map position. In either case, $done will
		2448	be called at the end of this process.
2267		2449
2268	=cut	2450	=cut
2269		2451
2270	our $GOTOGEN;	2452	our $GOTOGEN;
2271		2453
2272	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2273	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2274		2456
2275	# do generation counting so two concurrent goto's will be executed in-order	2457	# do generation counting so two concurrent goto's will be executed in-order
2276	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277		2459
2278	$self->enter_link;	2460	$self->enter_link;
…		…
2298		2480
2299	if ($gen == $self->{_goto_generation}) {	2481	if ($gen == $self->{_goto_generation}) {
2300	delete $self->{_goto_generation};	2482	delete $self->{_goto_generation};
2301	$self->leave_link ($map, $x, $y);	2483	$self->leave_link ($map, $x, $y);
2302	}	2484	}
		2485
		2486	$done->() if $done;
2303	})->prio (1);	2487	})->prio (1);
2304	}	2488	}
2305		2489
2306	=item $player_object->enter_exit ($exit_object)	2490	=item $player_object->enter_exit ($exit_object)
2307		2491
…		…
2416		2600
2417	utf8::encode $text;	2601	utf8::encode $text;
2418	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2602	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2419	}	2603	}
2420		2604
2421	=item $client->send_msg ($color, $type, $msg, [extra...])	2605	=item $client->send_msg ($channel, $msg, $color, [extra...])
2422		2606
2423	Send a drawinfo or msg packet to the client, formatting the msg for the	2607	Send a drawinfo or msg packet to the client, formatting the msg for the
2424	client if neccessary. C<$type> should be a string identifying the type of	2608	client if neccessary. C<$type> should be a string identifying the type of
2425	the message, with C<log> being the default. If C<$color> is negative, suppress	2609	the message, with C<log> being the default. If C<$color> is negative, suppress
2426	the message unless the client supports the msg packet.	2610	the message unless the client supports the msg packet.
2427		2611
2428	=cut	2612	=cut
2429		2613
		2614	our %CHANNEL = (
		2615	"c/identify" => {
		2616	id => "identify",
		2617	title => "Identify",
		2618	reply => undef,
		2619	tooltip => "Items recently identified",
		2620	},
		2621	"c/examine" => {
		2622	id => "examine",
		2623	title => "Examine",
		2624	reply => undef,
		2625	tooltip => "Signs and other items you examined",
		2626	},
		2627	);
		2628
2430	sub cf::client::send_msg {	2629	sub cf::client::send_msg {
2431	my ($self, $color, $type, $msg, @extra) = @_;	2630	my ($self, $channel, $msg, $color, @extra) = @_;
2432		2631
2433	$msg = $self->pl->expand_cfpod ($msg);	2632	$msg = $self->pl->expand_cfpod ($msg);
2434		2633
		2634	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2635
		2636	# check predefined channels, for the benefit of C
		2637	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2638
		2639	if (ref $channel) {
		2640	# send meta info to client, if not yet sent
		2641	unless (exists $self->{channel}{$channel->{id}}) {
		2642	$self->{channel}{$channel->{id}} = $channel;
		2643	$self->ext_msg (channel_info => $channel)
		2644	if $self->can_msg;
		2645	}
		2646
		2647	$channel = $channel->{id};
		2648	}
		2649
2435	return unless @extra \|\| length $msg;	2650	return unless @extra \|\| length $msg;
2436		2651
2437	if ($self->can_msg) {	2652	if ($self->can_msg) {
		2653	# default colour, mask it out
		2654	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2655	if $color & cf::NDI_DEF;
		2656
2438	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2657	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2658	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439	} else {	2659	} else {
2440	# replace some tags by gcfclient-compatible ones
2441	for ($msg) {
2442	1 while
2443	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448	}
2449
2450	if ($color >= 0) {	2660	if ($color >= 0) {
		2661	# replace some tags by gcfclient-compatible ones
		2662	for ($msg) {
		2663	1 while
		2664	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2665	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2666	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2667	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2668	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2669	}
		2670
		2671	$color &= cf::NDI_COLOR_MASK;
		2672
		2673	utf8::encode $msg;
		2674
2451	if (0 && $msg =~ /\[/) {	2675	if (0 && $msg =~ /\[/) {
		2676	# COMMAND/INFO
2452	$self->send_packet ("drawextinfo $color 4 0 $msg")	2677	$self->send_packet ("drawextinfo $color 10 8 $msg")
2453	} else {	2678	} else {
2454	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2679	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2455	$self->send_packet ("drawinfo $color $msg")	2680	$self->send_packet ("drawinfo $color $msg")
2456	}	2681	}
2457	}	2682	}
2458	}	2683	}
2459	}	2684	}
2460		2685
2461	=item $client->ext_event ($type, %msg)	2686	=item $client->ext_msg ($type, @msg)
2462		2687
2463	Sends an ext event to the client.	2688	Sends an ext event to the client.
2464		2689
2465	=cut	2690	=cut
2466		2691
2467	sub cf::client::ext_event($$%) {	2692	sub cf::client::ext_msg($$@) {
2468	my ($self, $type, %msg) = @_;	2693	my ($self, $type, @msg) = @_;
2469		2694
		2695	if ($self->extcmd == 2) {
		2696	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2697	} elsif ($self->extcmd == 1) { # TODO: remove
2470	$msg{msgtype} = "event_$type";	2698	push @msg, msgtype => "event_$type";
2471	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2699	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2700	}
		2701	}
		2702
		2703	=item $client->ext_reply ($msgid, @msg)
		2704
		2705	Sends an ext reply to the client.
		2706
		2707	=cut
		2708
		2709	sub cf::client::ext_reply($$@) {
		2710	my ($self, $id, @msg) = @_;
		2711
		2712	if ($self->extcmd == 2) {
		2713	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2714	} elsif ($self->extcmd == 1) {
		2715	#TODO: version 1, remove
		2716	unshift @msg, msgtype => "reply", msgid => $id;
		2717	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2718	}
2472	}	2719	}
2473		2720
2474	=item $success = $client->query ($flags, "text", \&cb)	2721	=item $success = $client->query ($flags, "text", \&cb)
2475		2722
2476	Queues a query to the client, calling the given callback with	2723	Queues a query to the client, calling the given callback with
…		…
2531	my ($ns, $buf) = @_;	2778	my ($ns, $buf) = @_;
2532		2779
2533	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2780	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534		2781
2535	if (ref $msg) {	2782	if (ref $msg) {
		2783	my ($type, $reply, @payload) =
		2784	"ARRAY" eq ref $msg
		2785	? @$msg
		2786	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2787
		2788	my @reply;
		2789
2536	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2790	if (my $cb = $EXTICMD{$type}) {
2537	if (my %reply = $cb->($ns, $msg)) {	2791	@reply = $cb->($ns, @payload);
2538	$reply{msgid} = $msg->{msgid};
2539	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540	}
2541	}	2792	}
		2793
		2794	$ns->ext_reply ($reply, @reply)
		2795	if $reply;
		2796
2542	} else {	2797	} else {
2543	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2798	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544	}	2799	}
2545		2800
2546	cf::override;	2801	cf::override;
…		…
2593	our $safe = new Safe "safe";	2848	our $safe = new Safe "safe";
2594	our $safe_hole = new Safe::Hole;	2849	our $safe_hole = new Safe::Hole;
2595		2850
2596	$SIG{FPE} = 'IGNORE';	2851	$SIG{FPE} = 'IGNORE';
2597		2852
2598	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2853	$safe->permit_only (Opcode::opset qw(
		2854	:base_core :base_mem :base_orig :base_math
		2855	grepstart grepwhile mapstart mapwhile
		2856	sort time
		2857	));
2599		2858
2600	# here we export the classes and methods available to script code	2859	# here we export the classes and methods available to script code
2601		2860
2602	=pod	2861	=pod
2603		2862
2604	The following functions and methods are available within a safe environment:	2863	The following functions and methods are available within a safe environment:
2605		2864
2606	cf::object	2865	cf::object
2607	contr pay_amount pay_player map x y force_find force_add	2866	contr pay_amount pay_player map x y force_find force_add
2608	insert remove	2867	insert remove name archname title slaying race decrease_ob_nr
2609		2868
2610	cf::object::player	2869	cf::object::player
2611	player	2870	player
2612		2871
2613	cf::player	2872	cf::player
…		…
2618		2877
2619	=cut	2878	=cut
2620		2879
2621	for (	2880	for (
2622	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2881	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2882	insert remove inv name archname title slaying race
2623	insert remove)],	2883	decrease_ob_nr)],
2624	["cf::object::player" => qw(player)],	2884	["cf::object::player" => qw(player)],
2625	["cf::player" => qw(peaceful)],	2885	["cf::player" => qw(peaceful)],
2626	["cf::map" => qw(trigger)],	2886	["cf::map" => qw(trigger)],
2627	) {	2887	) {
2628	no strict 'refs';	2888	no strict 'refs';
…		…
2704	# the server's init and main functions	2964	# the server's init and main functions
2705		2965
2706	sub load_facedata($) {	2966	sub load_facedata($) {
2707	my ($path) = @_;	2967	my ($path) = @_;
2708		2968
		2969	# HACK to clear player env face cache, we need some signal framework
		2970	# for this (global event?)
		2971	%ext::player_env::MUSIC_FACE_CACHE = ();
		2972
		2973	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2974
2709	warn "loading facedata from $path\n";	2975	warn "loading facedata from $path\n";
2710		2976
2711	my $facedata;	2977	my $facedata;
2712	0 < aio_load $path, $facedata	2978	0 < aio_load $path, $facedata
2713	or die "$path: $!";	2979	or die "$path: $!";
2714		2980
2715	$facedata = Coro::Storable::thaw $facedata;	2981	$facedata = Coro::Storable::thaw $facedata;
2716		2982
2717	$facedata->{version} == 2	2983	$facedata->{version} == 2
2718	or cf::cleanup "$path: version mismatch, cannot proceed.";	2984	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2985
		2986	# patch in the exptable
		2987	$facedata->{resource}{"res/exp_table"} = {
		2988	type => FT_RSRC,
		2989	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		2990	};
		2991	cf::cede_to_tick;
2719		2992
2720	{	2993	{
2721	my $faces = $facedata->{faceinfo};	2994	my $faces = $facedata->{faceinfo};
2722		2995
2723	while (my ($face, $info) = each %$faces) {	2996	while (my ($face, $info) = each %$faces) {
2724	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2997	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2725	cf::face::set_visibility $idx, $info->{visibility};	2998	cf::face::set_visibility $idx, $info->{visibility};
2726	cf::face::set_magicmap $idx, $info->{magicmap};	2999	cf::face::set_magicmap $idx, $info->{magicmap};
2727	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3000	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2728	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3001	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2729		3002
2730	cf::cede_to_tick;	3003	cf::cede_to_tick;
2731	}	3004	}
2732		3005
2733	while (my ($face, $info) = each %$faces) {	3006	while (my ($face, $info) = each %$faces) {
…		…
2758		3031
2759	{	3032	{
2760	# TODO: for gcfclient pleasure, we should give resources	3033	# TODO: for gcfclient pleasure, we should give resources
2761	# that gcfclient doesn't grok a >10000 face index.	3034	# that gcfclient doesn't grok a >10000 face index.
2762	my $res = $facedata->{resource};	3035	my $res = $facedata->{resource};
2763	my $enc = JSON::XS->new->utf8->canonical;	3036
		3037	my $soundconf = delete $res->{"res/sound.conf"};
2764		3038
2765	while (my ($name, $info) = each %$res) {	3039	while (my ($name, $info) = each %$res) {
2766	my $meta = $enc->encode ({
2767	name => $name,
2768	type => $info->{type},
2769	copyright => $info->{copyright},
2770	});
2771	my $data = pack "(w/a)", $meta, $info->{data};
2772	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774	use Data::Dumper; warn Dumper substr $data, 0, 100;#d#
2775
2776	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3040	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3041	my $data;
		3042
		3043	if ($info->{type} & 1) {
		3044	# prepend meta info
		3045
		3046	my $meta = $enc->encode ({
		3047	name => $name,
		3048	%{ $info->{meta} \|\| {} },
		3049	});
		3050
		3051	$data = pack "(w/a)", $meta, $info->{data};
		3052	} else {
		3053	$data = $info->{data};
		3054	}
		3055
		3056	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2777	cf::face::set_type $idx, 1;	3057	cf::face::set_type $idx, $info->{type};
2778	cf::face::set_data $idx, 0, $data, $chk;
2779		3058
2780	# TODO
2781	cf::cede_to_tick;	3059	cf::cede_to_tick;
2782	}	3060	}
		3061
		3062	if ($soundconf) {
		3063	$soundconf = $enc->decode (delete $soundconf->{data});
		3064
		3065	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3066	my $sound = $soundconf->{compat}[$_]
		3067	or next;
		3068
		3069	my $face = cf::face::find "sound/$sound->[1]";
		3070	cf::sound::set $sound->[0] => $face;
		3071	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3072	}
		3073
		3074	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3075	my $face = cf::face::find "sound/$v";
		3076	cf::sound::set $k => $face;
		3077	}
		3078	}
2783	}	3079	}
2784		3080
2785	1	3081	1
2786	}	3082	}
2787		3083
		3084	register_exticmd fx_want => sub {
		3085	my ($ns, $want) = @_;
		3086
		3087	while (my ($k, $v) = each %$want) {
		3088	$ns->fx_want ($k, $v);
		3089	}
		3090	};
		3091
2788	sub reload_regions {	3092	sub reload_regions {
		3093	# HACK to clear player env face cache, we need some signal framework
		3094	# for this (global event?)
		3095	%ext::player_env::MUSIC_FACE_CACHE = ();
		3096
2789	load_resource_file "$MAPDIR/regions"	3097	load_resource_file "$MAPDIR/regions"
2790	or die "unable to load regions file\n";	3098	or die "unable to load regions file\n";
		3099
		3100	for (cf::region::list) {
		3101	$_->{match} = qr/$_->{match}/
		3102	if exists $_->{match};
		3103	}
2791	}	3104	}
2792		3105
2793	sub reload_facedata {	3106	sub reload_facedata {
2794	load_facedata "$DATADIR/facedata"	3107	load_facedata "$DATADIR/facedata"
2795	or die "unable to load facedata\n";	3108	or die "unable to load facedata\n";
…		…
2824		3137
2825	sub init {	3138	sub init {
2826	reload_resources;	3139	reload_resources;
2827	}	3140	}
2828		3141
2829	sub cfg_load {	3142	sub reload_config {
2830	open my $fh, "<:utf8", "$CONFDIR/config"	3143	open my $fh, "<:utf8", "$CONFDIR/config"
2831	or return;	3144	or return;
2832		3145
2833	local $/;	3146	local $/;
2834	*CFG = YAML::Syck::Load <$fh>;	3147	*CFG = YAML::Syck::Load <$fh>;
…		…
2854	(async {	3167	(async {
2855	Event::one_event;	3168	Event::one_event;
2856	})->prio (Coro::PRIO_MAX);	3169	})->prio (Coro::PRIO_MAX);
2857	};	3170	};
2858		3171
2859	cfg_load;	3172	reload_config;
2860	db_init;	3173	db_init;
2861	load_extensions;	3174	load_extensions;
2862		3175
2863	$TICK_WATCHER->start;	3176	$TICK_WATCHER->start;
2864	Event::loop;	3177	Event::loop;
…		…
3057	warn "reloading cf.pm";	3370	warn "reloading cf.pm";
3058	require cf;	3371	require cf;
3059	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3372	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3060		3373
3061	warn "loading config and database again";	3374	warn "loading config and database again";
3062	cf::cfg_load;	3375	cf::reload_config;
3063		3376
3064	warn "loading extensions";	3377	warn "loading extensions";
3065	cf::load_extensions;	3378	cf::load_extensions;
3066		3379
3067	warn "reattaching attachments to objects/players";	3380	warn "reattaching attachments to objects/players";
…		…
3160	or die;	3473	or die;
3161		3474
3162	$map->width (50);	3475	$map->width (50);
3163	$map->height (50);	3476	$map->height (50);
3164	$map->alloc;	3477	$map->alloc;
3165	$map->_load_objects ("/tmp/x.map", 1);	3478	$map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3166	my $t = Event::time - $t;	3479	my $t = Event::time - $t;
3167		3480
3168	#next unless $t < 0.0013;#d#	3481	#next unless $t < 0.0013;#d#
3169	if ($t < $min) {	3482	if ($t < $min) {
3170	$min = $t;	3483	$min = $t;
…		…
3213		3526
3214	},	3527	},
3215	);	3528	);
3216		3529
3217	{	3530	{
		3531	BDB::min_parallel 8;
3218	BDB::max_poll_time $TICK * 0.1;	3532	BDB::max_poll_time $TICK * 0.1;
3219	$BDB_POLL_WATCHER = Event->io (	3533	$BDB_POLL_WATCHER = Event->io (
3220	reentrant => 0,	3534	reentrant => 0,
3221	fd => BDB::poll_fileno,	3535	fd => BDB::poll_fileno,
3222	poll => 'r',	3536	poll => 'r',
3223	prio => 0,	3537	prio => 0,
3224	data => WF_AUTOCANCEL,	3538	data => WF_AUTOCANCEL,
3225	cb => \&BDB::poll_cb,	3539	cb => \&BDB::poll_cb,
3226	);	3540	);
3227	BDB::min_parallel 8;
3228		3541
3229	BDB::set_sync_prepare {	3542	BDB::set_sync_prepare {
3230	my $status;	3543	my $status;
3231	my $current = $Coro::current;	3544	my $current = $Coro::current;
3232	(	3545	(
…		…
3253	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3566	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3254	0666;	3567	0666;
3255		3568
3256	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3569	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3257		3570
3258	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	3571	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3572	\| BDB::LOG_AUTOREMOVE, 1);
3259	$DB_ENV->set_lk_detect;	3573	$DB_ENV->set_lk_detect;
3260	};	3574	};
3261		3575
3262	cf::cleanup "db_env_open(db): $@" if $@;	3576	cf::cleanup "db_env_open(db): $@" if $@;
3263	};	3577	};
3264	}	3578	}
		3579
		3580	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3581	after => 11,
		3582	interval => 60,
		3583	hard => 1,
		3584	prio => 0,
		3585	data => WF_AUTOCANCEL,
		3586	cb => sub {
		3587	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3588	},
		3589	);
		3590	$BDB_TRICKLE_WATCHER = Event->timer (
		3591	after => 5,
		3592	interval => 10,
		3593	hard => 1,
		3594	prio => 0,
		3595	data => WF_AUTOCANCEL,
		3596	cb => sub {
		3597	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3598	},
		3599	);
3265	}	3600	}
3266		3601
3267	{	3602	{
3268	IO::AIO::min_parallel 8;	3603	IO::AIO::min_parallel 8;
3269		3604

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.302 by root, Tue Jul 10 16:23:59 2007 UTC vs. Revision 1.363 by root, Mon Sep 10 17:24:36 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.302 by root, Tue Jul 10 16:23:59 2007 UTC vs.
Revision 1.363 by root, Mon Sep 10 17:24:36 2007 UTC